From 494e9e3ddd1b7b829df2a70f49314079d0575019 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Fri, 11 Dec 2020 19:39:04 +0100 Subject: [PATCH] Linter go brrr --- Dockerfile | 10 ++-- README.md | 2 +- root/defaults/default | 38 ++++++------ root/defaults/nginx.conf | 124 +++++++++++++++++++-------------------- 4 files changed, 87 insertions(+), 87 deletions(-) diff --git a/Dockerfile b/Dockerfile index 413a4f4..64d30c7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,15 +2,15 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as grab-stage RUN \ apk add --no-cache --upgrade \ - curl \ + curl \ tar && \ mkdir -p /root/defaults/proxy-confs && \ curl -o \ - /tmp/proxy.tar.gz -L \ - "https://github.com/linuxserver/reverse-proxy-confs/tarball/master" && \ + /tmp/proxy.tar.gz -L \ + "https://github.com/linuxserver/reverse-proxy-confs/tarball/master" && \ tar xf \ - /tmp/proxy.tar.gz -C \ - /root/defaults/proxy-confs \ + /tmp/proxy.tar.gz -C \ + /root/defaults/proxy-confs \ --strip-components=1 \ --exclude=linux*/.gitattributes \ --exclude=linux*/.github \ diff --git a/README.md b/README.md index 9ec7331..d5d098c 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This mod adds some of the [proxy-conf](https://github.com/linuxserver/reverse-proxy-confs) functionality that is baked into [SWAG](https://github.com/linuxserver/docker-swag), to Nginx. -This mod does some reshuffling to the files that originally ships with our Nginx image. You have to track changes to these files yourself. If you are adding this mod to an exsisting install you have to modify, or replace these files yourself. +This mod does some reshuffling to the files that originally ships with our Nginx image. You have to track changes to these files yourself. If you are adding this mod to an existing install you have to modify, or replace these files yourself. | File | Change | | --- | --- | diff --git a/root/defaults/default b/root/defaults/default index ff353a7..84730f0 100644 --- a/root/defaults/default +++ b/root/defaults/default @@ -1,33 +1,33 @@ ## Version 2020/12/11 - Changelog: https://github.com/linuxserver/docker-mods/blob/nginx-proxy-confs/root/defaults/nginx.conf server { - listen 80 default_server; - listen 443 ssl; - server_name _; + listen 80 default_server; + listen 443 ssl; + server_name _; - root /config/www; + root /config/www; - index index.html index.htm index.php; + index index.html index.htm index.php; - # enable subfolder method reverse proxy confs - include /config/nginx/proxy-confs/*.subfolder.conf; + # enable subfolder method reverse proxy confs + include /config/nginx/proxy-confs/*.subfolder.conf; - ssl_certificate /config/keys/cert.crt; - ssl_certificate_key /config/keys/cert.key; + ssl_certificate /config/keys/cert.crt; + ssl_certificate_key /config/keys/cert.key; - client_max_body_size 0; + client_max_body_size 0; - location / { - try_files $uri $uri/ /index.html /index.php?$args =404; - } + location / { + try_files $uri $uri/ /index.html /index.php?$args =404; + } - location ~ \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass 127.0.0.1:9000; - fastcgi_index index.php; - include /etc/nginx/fastcgi_params; - } + location ~ \.php$ { + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass 127.0.0.1:9000; + fastcgi_index index.php; + include /etc/nginx/fastcgi_params; + } } diff --git a/root/defaults/nginx.conf b/root/defaults/nginx.conf index 3c640ab..b6be7f0 100644 --- a/root/defaults/nginx.conf +++ b/root/defaults/nginx.conf @@ -6,86 +6,86 @@ pid /run/nginx.pid; include /etc/nginx/modules/*.conf; events { - worker_connections 768; - # multi_accept on; + worker_connections 768; + # multi_accept on; } http { - ## - # Basic Settings - ## + ## + # Basic Settings + ## - client_body_buffer_size 128k; - client_max_body_size 0; - keepalive_timeout 65; - large_client_header_buffers 4 16k; - send_timeout 5m; - sendfile on; - tcp_nodelay on; - tcp_nopush on; - types_hash_max_size 2048; - variables_hash_max_size 2048; + client_body_buffer_size 128k; + client_max_body_size 0; + keepalive_timeout 65; + large_client_header_buffers 4 16k; + send_timeout 5m; + sendfile on; + tcp_nodelay on; + tcp_nopush on; + types_hash_max_size 2048; + variables_hash_max_size 2048; - # server_tokens off; - # server_names_hash_bucket_size 64; - # server_name_in_redirect off; + # server_tokens off; + # server_names_hash_bucket_size 64; + # server_name_in_redirect off; - include /etc/nginx/mime.types; - default_type application/octet-stream; + include /etc/nginx/mime.types; + default_type application/octet-stream; - ## - # Logging Settings - ## + ## + # Logging Settings + ## - access_log /config/log/nginx/access.log; - error_log /config/log/nginx/error.log; + access_log /config/log/nginx/access.log; + error_log /config/log/nginx/error.log; - ## - # Gzip Settings - ## + ## + # Gzip Settings + ## - gzip on; - gzip_disable "msie6"; + gzip on; + gzip_disable "msie6"; - # gzip_vary on; - # gzip_proxied any; - # gzip_comp_level 6; - # gzip_buffers 16 8k; - # gzip_http_version 1.1; - # gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; + # gzip_vary on; + # gzip_proxied any; + # gzip_comp_level 6; + # gzip_buffers 16 8k; + # gzip_http_version 1.1; + # gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript; - ## - # nginx-naxsi config - ## - # Uncomment it if you installed nginx-naxsi - ## + ## + # nginx-naxsi config + ## + # Uncomment it if you installed nginx-naxsi + ## - #include /etc/nginx/naxsi_core.rules; + #include /etc/nginx/naxsi_core.rules; - ## - # nginx-passenger config - ## - # Uncomment it if you installed nginx-passenger - ## + ## + # nginx-passenger config + ## + # Uncomment it if you installed nginx-passenger + ## - #passenger_root /usr; - #passenger_ruby /usr/bin/ruby; + #passenger_root /usr; + #passenger_ruby /usr/bin/ruby; - ## - # WebSocket proxying - ## - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } + ## + # WebSocket proxying + ## + map $http_upgrade $connection_upgrade { + default upgrade; + '' close; + } - ## - # Virtual Host Configs - ## - include /etc/nginx/conf.d/*.conf; - include /config/nginx/site-confs/*; - lua_load_resty_core off; + ## + # Virtual Host Configs + ## + include /etc/nginx/conf.d/*.conf; + include /config/nginx/site-confs/*; + lua_load_resty_core off; } daemon off; \ No newline at end of file