From 6dbe643d556f061a1aaf6dae193c582a233b6a86 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Tue, 11 Apr 2023 11:13:30 +0200 Subject: [PATCH] Add nginx --- mealie/config.json | 2 +- mealie/rootfs/etc/cont-init.d/31-nginx.sh | 5 +++-- mealie/rootfs/etc/nginx/servers/ssl.conf | 2 +- mealie/rootfs/run.txt | 2 ++ 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mealie/config.json b/mealie/config.json index de5c70466..72400ec8b 100644 --- a/mealie/config.json +++ b/mealie/config.json @@ -44,6 +44,6 @@ }, "slug": "mealie", "url": "https://github.com/alexbelgium/hassio-addons", - "version": "v1.0.0-beta-2", + "version": "v1.0.0-beta-3", "webui": "[PROTO:ssl]://[HOST]:[PORT:3000]" } \ No newline at end of file diff --git a/mealie/rootfs/etc/cont-init.d/31-nginx.sh b/mealie/rootfs/etc/cont-init.d/31-nginx.sh index 48cf9b031..f24088241 100755 --- a/mealie/rootfs/etc/cont-init.d/31-nginx.sh +++ b/mealie/rootfs/etc/cont-init.d/31-nginx.sh @@ -9,8 +9,9 @@ if bashio::config.true 'ssl'; then # Adapt nginx template certfile=$(bashio::config 'certfile') keyfile=$(bashio::config 'keyfile') - sed -i "s#%%certfile%%#${certfile}#g" /etc/nginx/servers/ssl.conf - sed -i "s#%%keyfile%%#${keyfile}#g" /etc/nginx/servers/ssl.conf + sed -i "s|%%certfile%%|${certfile}|g" /etc/nginx/servers/ssl.conf + sed -i "s|%%keyfile%%|${keyfile}|g" /etc/nginx/servers/ssl.conf + sed -i "s|3000;|3000 ssl;|g" /etc/nginx/servers/ssl.conf else diff --git a/mealie/rootfs/etc/nginx/servers/ssl.conf b/mealie/rootfs/etc/nginx/servers/ssl.conf index aa8ef1eaa..3a4a4e70a 100644 --- a/mealie/rootfs/etc/nginx/servers/ssl.conf +++ b/mealie/rootfs/etc/nginx/servers/ssl.conf @@ -1,6 +1,6 @@ server { - listen 3000 default_server; + listen 3000; include /etc/nginx/includes/server_params.conf; include /etc/nginx/includes/proxy_params.conf; diff --git a/mealie/rootfs/run.txt b/mealie/rootfs/run.txt index 442c313b4..74dd1cbfa 100644 --- a/mealie/rootfs/run.txt +++ b/mealie/rootfs/run.txt @@ -108,5 +108,7 @@ chmod -R 777 /config/addons_config/mealie_data cp -r /data/* /config/addons_config/mealie_data/ bashio::log.info "Starting app" +nginx & true +bashio::log.info "Starting app" fi