diff --git a/ubooquity/config.json b/ubooquity/config.json index 62a70735c..a2d65e59f 100644 --- a/ubooquity/config.json +++ b/ubooquity/config.json @@ -4,6 +4,9 @@ "boot": "auto", "description": "Free, lightweight and easy-to-use home server for your comics and ebooks", "environment": {}, + "ingress": true, + "ingress_stream": true, + "panel_icon": "mdi:library", "map": ["media:rw", "config:rw", "share:rw", "ssl"], "name": "Ubooquity", "options": { diff --git a/ubooquity/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/ubooquity/rootfs/etc/cont-init.d/32-nginx_ingress.sh new file mode 100644 index 000000000..b1e7bc32c --- /dev/null +++ b/ubooquity/rootfs/etc/cont-init.d/32-nginx_ingress.sh @@ -0,0 +1,15 @@ +#!/usr/bin/with-contenv bashio + +################### +# INGRESS SETTING # +################### +declare port +declare certfile +declare ingress_interface +declare ingress_port +declare keyfile + +# General values +port=$(bashio::addon.ingress_port) +sed -i "s|%%port%%|$port|g" /etc/nginx/servers/ingress.conf +sed -i "s|%%interface%%|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ingress.conf diff --git a/ubooquity/rootfs/etc/cont-init.d/32-nginx_ssl.sh b/ubooquity/rootfs/etc/cont-init.d/32-nginx_ssl.sh index 9a5ceddd1..7a8bcb1e5 100644 --- a/ubooquity/rootfs/etc/cont-init.d/32-nginx_ssl.sh +++ b/ubooquity/rootfs/etc/cont-init.d/32-nginx_ssl.sh @@ -1,8 +1,8 @@ #!/usr/bin/with-contenv bashio -################# -# NGINX SETTING # -################# +############### +# SSL SETTING # +############### declare port declare certfile declare ingress_interface @@ -10,7 +10,7 @@ declare ingress_port declare keyfile # General values -port=2205 +port=2205 sed -i "s|%%port%%|$port|g" /etc/nginx/servers/ssl.conf sed -i "s|%%interface%%|$(bashio::addon.ip_address)|g" /etc/nginx/servers/ssl.conf @@ -20,8 +20,7 @@ if bashio::config.true 'ssl'; then certfile=$(bashio::config 'certfile') keyfile=$(bashio::config 'keyfile') sed -i "s|default_server|ssl|g" /etc/nginx/servers/ssl.conf - sed -i "7 i ssl_certificate /ssl/$certfile;" /etc/nginx/servers/ssl.conf + sed -i "7 i ssl_certificate /ssl/$certfile;" /etc/nginx/servers/ssl.conf sed -i "7 i ssl_certificate_key /ssl/$keyfile;" /etc/nginx/servers/ssl.conf - bashio::log.info "Ssl enabled, please use https for connection" + bashio::log.info "Ssl enabled, please use https for connection" fi - diff --git a/ubooquity/rootfs/etc/nginx/servers/ingress.conf b/ubooquity/rootfs/etc/nginx/servers/ingress.conf new file mode 100644 index 000000000..c5a07afc8 --- /dev/null +++ b/ubooquity/rootfs/etc/nginx/servers/ingress.conf @@ -0,0 +1,11 @@ +server { + listen %%interface%%:%%port%% default_server; + include /etc/nginx/includes/server_params.conf; + include /etc/nginx/includes/proxy_params.conf; + client_max_body_size 0; + + location / { + set $upstream_port 2202; + proxy_pass http://127.0.0.1:$upstream_port; + } +}