diff --git a/fireflyiii/config.json b/fireflyiii/config.json index c2eccde38..0b564679e 100644 --- a/fireflyiii/config.json +++ b/fireflyiii/config.json @@ -111,6 +111,6 @@ "startup": "services", "udev": true, "url": "https://github.com/alexbelgium/hassio-addons", - "version": "6.1.18-2", + "version": "6.1.18-2test", "webui": "[PROTO:ssl]://[HOST]:[PORT:8080]" } diff --git a/fireflyiii/rootfs/etc/cont-init.d/30-ssl.sh b/fireflyiii/rootfs/etc/cont-init.d/30-ssl.sh index f5d92562d..862bf7672 100644 --- a/fireflyiii/rootfs/etc/cont-init.d/30-ssl.sh +++ b/fireflyiii/rootfs/etc/cont-init.d/30-ssl.sh @@ -24,7 +24,8 @@ if bashio::config.true 'ssl'; then sed -i "/proxy_params.conf/a ssl_certificate /ssl/$certfile;" /etc/nginx/servers/ssl.conf sed -i "/proxy_params.conf/a ssl_certificate_key /ssl/$keyfile;" /etc/nginx/servers/ssl.conf - bashio::log.info "Ssl enabled, please use https for connection. UI is at https://YOURIP:$(bashio::addon.port 2342)" -else - rm -r /etc/nginx/servers/ssl.conf + bashio::log.info "Ssl enabled, please use https for connection. UI is at https://YOURIP:$(bashio::addon.port 8443)" + + bashio::log.info "Starting nginx..." + nginx & true fi diff --git a/fireflyiii/rootfs/etc/nginx/servers/ssl.conf b/fireflyiii/rootfs/etc/nginx/servers/ssl.conf index 98242a331..dc65b8073 100644 --- a/fireflyiii/rootfs/etc/nginx/servers/ssl.conf +++ b/fireflyiii/rootfs/etc/nginx/servers/ssl.conf @@ -9,18 +9,27 @@ server { client_max_body_size 0; - root /var/www/firefly-iii/public/; + root /var/www/firefly-iii/public; index index.html; + large_client_header_buffers 8 32k; + client_max_body_size 300M; + index index.php index.html index.htm; + server_name firefly.home.internal; - location / { - root /var/www/firefly-iii/public/; + location / { + try_files $uri $uri/ /index.php?$query_string; + autoindex on; + sendfile off; + } + + location ~ \.php$ { + try_files $uri =404; + fastcgi_pass unix:/var/run/php/php8.3-fpm.sock; + fastcgi_index index.php; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + include fastcgi_params; + fastcgi_read_timeout 300; } - location ~* \.php(?:$|/) { - include snippets/fastcgi-php.conf; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice - fastcgi_pass unix:/run/php/php8.0-fpm.sock; - } }