diff options
Diffstat (limited to 'net/nginx/files-luci-support')
| -rw-r--r-- | net/nginx/files-luci-support/60_nginx-luci-support | 4 | ||||
| -rw-r--r-- | net/nginx/files-luci-support/70_nginx-luci-support-ssl | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/nginx/files-luci-support/60_nginx-luci-support b/net/nginx/files-luci-support/60_nginx-luci-support index 38a8aa885..dd076d260 100644 --- a/net/nginx/files-luci-support/60_nginx-luci-support +++ b/net/nginx/files-luci-support/60_nginx-luci-support @@ -1,7 +1,7 @@ #!/bin/sh if [ -f "/etc/nginx/luci_nginx.conf" ] && [ -f "/etc/nginx/nginx.conf" ]; then - if [ ! "$(cat '/etc/nginx/nginx.conf' | grep -q 'luci_uwsgi.conf')" ]; then + if [ ! "$(cat '/etc/nginx/nginx.conf' | grep 'luci_uwsgi.conf')" ]; then mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf_old mv /etc/nginx/luci_nginx.conf /etc/nginx/nginx.conf core_number=$(grep -c ^processor /proc/cpuinfo) @@ -20,6 +20,8 @@ if [ -f "/etc/nginx/luci_nginx.conf" ] && [ -f "/etc/nginx/nginx.conf" ]; then else /etc/init.d/uwsgi start fi + else + rm /etc/nginx/luci_nginx.conf fi fi diff --git a/net/nginx/files-luci-support/70_nginx-luci-support-ssl b/net/nginx/files-luci-support/70_nginx-luci-support-ssl index 1cc1a85fc..76ce3a819 100644 --- a/net/nginx/files-luci-support/70_nginx-luci-support-ssl +++ b/net/nginx/files-luci-support/70_nginx-luci-support-ssl @@ -2,7 +2,7 @@ if [ -f "/etc/nginx/luci_nginx_ssl.conf" ] && [ -f "/etc/nginx/nginx.conf" ]; then - if [ ! "$(cat '/etc/nginx/nginx.conf' | grep -q 'return 301 https://$host$request_uri;')" ]; then + if [ ! "$(cat '/etc/nginx/nginx.conf' | grep 'return 301 https://$host$request_uri;')" ]; then if [ -f "/etc/nginx/nginx.conf_old" ]; then rm /etc/nginx/nginx.conf else @@ -16,6 +16,8 @@ if [ -f "/etc/nginx/luci_nginx_ssl.conf" ] && [ -f "/etc/nginx/nginx.conf" ]; th else /etc/init.d/nginx start fi + else + rm /etc/nginx/luci_nginx_ssl.conf fi fi |