Adds Ingress support

This commit is contained in:
Franck Nijhof 2019-06-23 18:47:44 +02:00
parent 6cd994bc1c
commit 45f3f2b743
No known key found for this signature in database
GPG key ID: D62583BA8AB11CA3
7 changed files with 57 additions and 9 deletions

View file

@ -5,6 +5,8 @@
"description": "ERP beyond your fridge! A groceries & household management solution for your home",
"url": "https://github.com/hassio-addons/addon-grocy",
"webui": "[PROTO:ssl]://[HOST]:[PORT:80]",
"ingress": true,
"ingress_port": 1337,
"startup": "system",
"arch": [
"aarch64",

View file

@ -5,6 +5,8 @@
# ==============================================================================
declare certfile
declare keyfile
declare ingress_interface
declare ingress_entry
bashio::config.require.ssl
@ -18,3 +20,9 @@ if bashio::config.true 'ssl'; then
else
mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
fi
ingress_interface=$(bashio::addon.ip_address)
sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
ingress_entry=$(bashio::addon.ingress_entry)
sed -i "s#%%ingress_entry%%#${ingress_entry}#g" /etc/php7/php-fpm.d/ingress.conf

View file

@ -16,15 +16,6 @@ location ~* .(jpg|jpeg|png|gif|ico|css|js)$ {
expires 365d;
}
location ~ .php$ {
fastcgi_pass 127.0.0.1:9001;
fastcgi_read_timeout 900;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include /etc/nginx/includes/fastcgi_params.conf;
}
location ~ /\.ht {
deny all;
}

View file

@ -8,4 +8,13 @@ server {
ssl_certificate_key /ssl/%%keyfile%%;
include /etc/nginx/includes/server_params.conf;
location ~ .php$ {
fastcgi_pass 127.0.0.1:9001;
fastcgi_read_timeout 900;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include /etc/nginx/includes/fastcgi_params.conf;
}
}

View file

@ -2,4 +2,13 @@ server {
listen 80 default_server;
include /etc/nginx/includes/server_params.conf;
location ~ .php$ {
fastcgi_pass 127.0.0.1:9001;
fastcgi_read_timeout 900;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include /etc/nginx/includes/fastcgi_params.conf;
}
}

View file

@ -0,0 +1,17 @@
server {
listen %%interface%%:1337 default_server;
include /etc/nginx/includes/server_params.conf;
allow 172.30.32.2;
deny all;
location ~ .php$ {
fastcgi_pass 127.0.0.1:9002;
fastcgi_read_timeout 900;
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_index index.php;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
include /etc/nginx/includes/fastcgi_params.conf;
}
}

View file

@ -0,0 +1,12 @@
[ingress]
user = nginx
group = nginx
listen = 127.0.0.1:9002
pm = dynamic
pm.max_children = 10
pm.start_servers = 3
pm.min_spare_servers = 2
pm.max_spare_servers = 5
pm.max_requests = 1024
clear_env = no
env[GROCY_BASE_URL] = '%%ingress_entry%%'