diff --git a/resources/fluidd_nginx.cfg b/resources/klipper_webui_nginx.cfg similarity index 88% rename from resources/fluidd_nginx.cfg rename to resources/klipper_webui_nginx.cfg index 8e6dd70..c0db5cc 100644 --- a/resources/fluidd_nginx.cfg +++ b/resources/klipper_webui_nginx.cfg @@ -1,11 +1,11 @@ -# /etc/nginx/sites-available/fluidd +# /etc/nginx/sites-available/<> server { listen 80; listen [::]:80; - access_log /var/log/nginx/fluidd-access.log; - error_log /var/log/nginx/fluidd-error.log; + access_log /var/log/nginx/<>-access.log; + error_log /var/log/nginx/<>-error.log; #disable this section on smaller hardware like a pi zero gzip on; @@ -17,8 +17,8 @@ server { gzip_http_version 1.1; gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/json application/xml; - #web_path from fluidd static files - root /home/pi/fluidd; + #web_path from <> static files + root /home/pi/<>; index index.html; server_name _; @@ -56,4 +56,4 @@ server { location /webcam/ { proxy_pass http://mjpgstreamer/; } -} +} \ No newline at end of file diff --git a/resources/mainsail_nginx.cfg b/resources/mainsail_nginx.cfg deleted file mode 100644 index 8e0adef..0000000 --- a/resources/mainsail_nginx.cfg +++ /dev/null @@ -1,59 +0,0 @@ -# /etc/nginx/sites-available/mainsail - -server { - listen 80; - listen [::]:80; - - access_log /var/log/nginx/mainsail-access.log; - error_log /var/log/nginx/mainsail-error.log; - - #disable this section on smaller hardware like a pi zero - gzip on; - gzip_vary on; - gzip_proxied any; - gzip_proxied expired no-cache no-store private auth; - gzip_comp_level 4; - gzip_buffers 16 8k; - gzip_http_version 1.1; - gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/json application/xml; - - #web_path from mainsail static files - root /home/pi/mainsail; - - index index.html; - server_name _; - - #max upload size for gcodes (0 = no limit) - client_max_body_size 0; - - location / { - try_files $uri $uri/ /index.html; - } - - location = /index.html { - add_header Cache-Control "no-store, no-cache, must-revalidate"; - } - - location /websocket { - proxy_pass http://apiserver/websocket; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_read_timeout 86400; - } - - location ~ ^/(printer|api|access|machine|server)/ { - proxy_pass http://apiserver$request_uri; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Scheme $scheme; - } - - location /webcam/ { - proxy_pass http://mjpgstreamer/; - } -} diff --git a/scripts/network_functions.sh b/scripts/network_functions.sh index 9002638..23fb554 100755 --- a/scripts/network_functions.sh +++ b/scripts/network_functions.sh @@ -6,8 +6,9 @@ set_nginx_cfg(){ #execute operations status_msg "Creating Nginx configuration for $1 ..." #copy content from resources to the respective nginx config file - cat ${SRCDIR}/kiauh/resources/$1_nginx.cfg > ${SRCDIR}/kiauh/resources/$1 + cat ${SRCDIR}/kiauh/resources/klipper_webui_nginx.cfg > ${SRCDIR}/kiauh/resources/$1 ##edit the nginx config file before moving it + sed -i "s/<>/$1/g" ${SRCDIR}/kiauh/resources/$1 if [ "$SET_LISTEN_PORT" != "$DEFAULT_PORT" ]; then status_msg "Configuring port for $1 ..." #set listen port ipv4