mirror of
https://github.com/hassio-addons/addon-grocy.git
synced 2025-05-05 11:41:32 +00:00
✨ Adds Ingress support
This commit is contained in:
parent
6cd994bc1c
commit
45f3f2b743
7 changed files with 57 additions and 9 deletions
|
@ -5,6 +5,8 @@
|
||||||
"description": "ERP beyond your fridge! A groceries & household management solution for your home",
|
"description": "ERP beyond your fridge! A groceries & household management solution for your home",
|
||||||
"url": "https://github.com/hassio-addons/addon-grocy",
|
"url": "https://github.com/hassio-addons/addon-grocy",
|
||||||
"webui": "[PROTO:ssl]://[HOST]:[PORT:80]",
|
"webui": "[PROTO:ssl]://[HOST]:[PORT:80]",
|
||||||
|
"ingress": true,
|
||||||
|
"ingress_port": 1337,
|
||||||
"startup": "system",
|
"startup": "system",
|
||||||
"arch": [
|
"arch": [
|
||||||
"aarch64",
|
"aarch64",
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
declare certfile
|
declare certfile
|
||||||
declare keyfile
|
declare keyfile
|
||||||
|
declare ingress_interface
|
||||||
|
declare ingress_entry
|
||||||
|
|
||||||
bashio::config.require.ssl
|
bashio::config.require.ssl
|
||||||
|
|
||||||
|
@ -18,3 +20,9 @@ if bashio::config.true 'ssl'; then
|
||||||
else
|
else
|
||||||
mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
|
mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf
|
||||||
fi
|
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
|
||||||
|
|
|
@ -16,15 +16,6 @@ location ~* .(jpg|jpeg|png|gif|ico|css|js)$ {
|
||||||
expires 365d;
|
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 {
|
location ~ /\.ht {
|
||||||
deny all;
|
deny all;
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,4 +8,13 @@ server {
|
||||||
ssl_certificate_key /ssl/%%keyfile%%;
|
ssl_certificate_key /ssl/%%keyfile%%;
|
||||||
|
|
||||||
include /etc/nginx/includes/server_params.conf;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,4 +2,13 @@ server {
|
||||||
listen 80 default_server;
|
listen 80 default_server;
|
||||||
|
|
||||||
include /etc/nginx/includes/server_params.conf;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
17
grocy/rootfs/etc/nginx/servers/ingress.conf
Normal file
17
grocy/rootfs/etc/nginx/servers/ingress.conf
Normal 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;
|
||||||
|
}
|
||||||
|
}
|
12
grocy/rootfs/etc/php7/php-fpm.d/ingress.conf
Normal file
12
grocy/rootfs/etc/php7/php-fpm.d/ingress.conf
Normal 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%%'
|
Loading…
Add table
Add a link
Reference in a new issue