From 0f11584bff5fb485a929f60065c17a6b1639d0fd Mon Sep 17 00:00:00 2001 From: Christian Cleberg Date: Mon, 16 Feb 2026 12:08:14 -0600 Subject: slightly minify nginx files --- linux/nginx/etc/nginx/conf.d/ao.conf | 27 +---------- linux/nginx/etc/nginx/conf.d/art.conf | 29 ++---------- linux/nginx/etc/nginx/conf.d/auth.conf | 32 ++----------- linux/nginx/etc/nginx/conf.d/br.conf | 33 ++----------- linux/nginx/etc/nginx/conf.d/bt.conf | 36 ++------------- linux/nginx/etc/nginx/conf.d/bw.conf | 51 ++++++-------------- linux/nginx/etc/nginx/conf.d/cc.conf | 29 ++---------- linux/nginx/etc/nginx/conf.d/cleberg.io | 54 ---------------------- linux/nginx/etc/nginx/conf.d/cleberg.io.conf | 20 ++++++++ linux/nginx/etc/nginx/conf.d/cleberg.net.conf | 46 ++---------------- .../etc/nginx/conf.d/cleberg.net_wildcard.conf | 24 ---------- linux/nginx/etc/nginx/conf.d/cv.conf | 26 +---------- linux/nginx/etc/nginx/conf.d/ddns.conf | 34 ++------------ linux/nginx/etc/nginx/conf.d/default.conf | 40 +++++----------- linux/nginx/etc/nginx/conf.d/docker.conf | 34 ++------------ linux/nginx/etc/nginx/conf.d/files.conf | 29 +----------- linux/nginx/etc/nginx/conf.d/gh.conf | 27 +---------- linux/nginx/etc/nginx/conf.d/ha.conf | 30 ++---------- linux/nginx/etc/nginx/conf.d/hat.conf | 29 ++---------- linux/nginx/etc/nginx/conf.d/hn.conf | 37 +++++---------- linux/nginx/etc/nginx/conf.d/img.conf | 26 +---------- linux/nginx/etc/nginx/conf.d/irc.conf | 34 ++------------ linux/nginx/etc/nginx/conf.d/ld.conf | 29 ++---------- linux/nginx/etc/nginx/conf.d/lemmy.conf | 29 ++---------- linux/nginx/etc/nginx/conf.d/lt.conf | 31 ++----------- linux/nginx/etc/nginx/conf.d/mz.conf | 31 ++----------- linux/nginx/etc/nginx/conf.d/no-ssl.default.conf | 29 ++---------- linux/nginx/etc/nginx/conf.d/office.conf | 27 +---------- linux/nginx/etc/nginx/conf.d/org.conf | 27 +---------- linux/nginx/etc/nginx/conf.d/paste.conf | 31 ++----------- linux/nginx/etc/nginx/conf.d/pb.conf | 30 ++---------- linux/nginx/etc/nginx/conf.d/pgp.conf | 28 +---------- linux/nginx/etc/nginx/conf.d/photos.conf | 35 +------------- linux/nginx/etc/nginx/conf.d/pin.conf | 29 ++---------- linux/nginx/etc/nginx/conf.d/piped.conf | 32 ++----------- linux/nginx/etc/nginx/conf.d/projects.conf | 25 +--------- linux/nginx/etc/nginx/conf.d/rd.conf | 31 ++----------- .../etc/nginx/conf.d/reminiscecleberg.com.conf | 23 +-------- linux/nginx/etc/nginx/conf.d/rimgo.conf | 29 ++---------- linux/nginx/etc/nginx/conf.d/rl.conf | 34 ++------------ linux/nginx/etc/nginx/conf.d/rss.conf | 39 ++-------------- linux/nginx/etc/nginx/conf.d/search.conf | 30 ++---------- linux/nginx/etc/nginx/conf.d/send.conf | 29 ++---------- linux/nginx/etc/nginx/conf.d/slash.conf | 31 ++----------- linux/nginx/etc/nginx/conf.d/small.conf | 31 ++----------- linux/nginx/etc/nginx/conf.d/ssh.conf | 36 ++------------- linux/nginx/etc/nginx/conf.d/teddit.conf | 36 ++------------- linux/nginx/etc/nginx/conf.d/wyl.conf | 34 ++------------ 48 files changed, 191 insertions(+), 1332 deletions(-) delete mode 100644 linux/nginx/etc/nginx/conf.d/cleberg.io create mode 100644 linux/nginx/etc/nginx/conf.d/cleberg.io.conf (limited to 'linux') diff --git a/linux/nginx/etc/nginx/conf.d/ao.conf b/linux/nginx/etc/nginx/conf.d/ao.conf index 96d232f..1c7b3be 100644 --- a/linux/nginx/etc/nginx/conf.d/ao.conf +++ b/linux/nginx/etc/nginx/conf.d/ao.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name ao.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:9380; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:9380; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name ao.cleberg.net; - - return 301 https://$host$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/art.conf b/linux/nginx/etc/nginx/conf.d/art.conf index 6ce012a..8944f5c 100644 --- a/linux/nginx/etc/nginx/conf.d/art.conf +++ b/linux/nginx/etc/nginx/conf.d/art.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name art.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:3003; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:3003; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name art.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/auth.conf b/linux/nginx/etc/nginx/conf.d/auth.conf index 31c0a86..61ffcfc 100644 --- a/linux/nginx/etc/nginx/conf.d/auth.conf +++ b/linux/nginx/etc/nginx/conf.d/auth.conf @@ -1,42 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name auth.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - set $upstream http://127.0.0.1:9092; - + set $upstream http://127.0.0.1:9092; location / { - proxy_pass $upstream; - + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - location /api/verify { - proxy_pass $upstream; - } - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name auth.cleberg.net; - - return 301 https://$host$request_uri; + location /api/verify { proxy_pass $upstream; } } diff --git a/linux/nginx/etc/nginx/conf.d/br.conf b/linux/nginx/etc/nginx/conf.d/br.conf index 414b703..1cccdee 100644 --- a/linux/nginx/etc/nginx/conf.d/br.conf +++ b/linux/nginx/etc/nginx/conf.d/br.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name br.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - set $upstream http://127.0.0.1:3030; - proxy_pass $upstream; - + location / { + set $upstream http://127.0.0.1:3030; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; - } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name br.cleberg.net; - - return 301 https://$host$request_uri; + } + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/bt.conf b/linux/nginx/etc/nginx/conf.d/bt.conf index 1fa0bfa..7e4d11f 100644 --- a/linux/nginx/etc/nginx/conf.d/bt.conf +++ b/linux/nginx/etc/nginx/conf.d/bt.conf @@ -1,46 +1,18 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name bt.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - set $upstream http://127.0.0.1:9091; - - location /authelia { - include custom.d/reverse_proxy/authelia.conf; - } - + set $upstream http://127.0.0.1:9091; + location /authelia { include custom.d/reverse_proxy/authelia.conf; } location / { - proxy_pass $upstream; - + proxy_pass $upstream; include custom.d/reverse_proxy/authelia_request.conf; - # include custom.d/reverse_proxy/basic.conf; proxy_pass_header X-bt-Session-Id; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name bt.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/bw.conf b/linux/nginx/etc/nginx/conf.d/bw.conf index af63166..45fbc8c 100644 --- a/linux/nginx/etc/nginx/conf.d/bw.conf +++ b/linux/nginx/etc/nginx/conf.d/bw.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { - listen [::]:443 ssl; - listen 443 ssl; - http2 on; - - server_name bw.cleberg.net; - - include custom.d/tls/ssl_engine.conf; - include custom.d/tls/certificate_files.conf; - include custom.d/tls/policy_balanced.conf; - include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - set $upstream http://127.0.0.1:10416; - proxy_pass $upstream; - - include custom.d/reverse_proxy/basic.conf; - } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name bw.cleberg.net; - - return 301 https://$host$request_uri; + listen [::]:443 ssl; + listen 443 ssl; + http2 on; + server_name bw.cleberg.net; + include custom.d/tls/ssl_engine.conf; + include custom.d/tls/certificate_files.conf; + include custom.d/tls/policy_balanced.conf; + include custom.d/basic.conf; + location / { + set $upstream http://127.0.0.1:10416; + proxy_pass $upstream; + include custom.d/reverse_proxy/basic.conf; + } + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/cc.conf b/linux/nginx/etc/nginx/conf.d/cc.conf index a3978b1..d37f336 100644 --- a/linux/nginx/etc/nginx/conf.d/cc.conf +++ b/linux/nginx/etc/nginx/conf.d/cc.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name cc.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:8111; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:8111; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name cc.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/cleberg.io b/linux/nginx/etc/nginx/conf.d/cleberg.io deleted file mode 100644 index 70c60a5..0000000 --- a/linux/nginx/etc/nginx/conf.d/cleberg.io +++ /dev/null @@ -1,54 +0,0 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- -server { - listen [::]:443 ssl; - listen 443 ssl; - http2 on; - - server_name www.cleberg.io cleberg.io; - - include custom.d/tls/ssl_engine.conf; - include custom.d/tls/policy_balanced.conf; -# include custom.d/tls/certificate_files.conf; - ssl_certificate /etc/letsencrypt/live/cleberg.io/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/cleberg.io/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/cleberg.io/chain.pem; - - return 301 $scheme://cleberg.io$request_uri; -} - - -server { - listen [::]:443 ssl; - listen 443 ssl; - http2 on; - - server_name cleberg.io; - - include custom.d/tls/ssl_engine.conf; - include custom.d/tls/policy_balanced.conf; - include custom.d/basic.conf; - -# include custom.d/tls/certificate_files.conf; - ssl_certificate /etc/letsencrypt/live/cleberg.io/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/cleberg.io/privkey.pem; - ssl_trusted_certificate /etc/letsencrypt/live/cleberg.io/chain.pem; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - return 301 https://cleberg.net; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name www.cleberg.io cleberg.io; - - return 301 https://cleberg.io$request_uri; -} diff --git a/linux/nginx/etc/nginx/conf.d/cleberg.io.conf b/linux/nginx/etc/nginx/conf.d/cleberg.io.conf new file mode 100644 index 0000000..602f602 --- /dev/null +++ b/linux/nginx/etc/nginx/conf.d/cleberg.io.conf @@ -0,0 +1,20 @@ +server { + listen [::]:443 ssl; + listen 443 ssl; + http2 on; + server_name cleberg.io; + include custom.d/tls/ssl_engine.conf; + include custom.d/tls/policy_balanced.conf; + include custom.d/basic.conf; + ssl_certificate /etc/letsencrypt/live/cleberg.io/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/cleberg.io/privkey.pem; + ssl_trusted_certificate /etc/letsencrypt/live/cleberg.io/chain.pem; + return 301 https://cleberg.net; +} + +server { + listen [::]:80; + listen 80; + server_name www.cleberg.io cleberg.io; + return 301 https://cleberg.io$request_uri; +} diff --git a/linux/nginx/etc/nginx/conf.d/cleberg.net.conf b/linux/nginx/etc/nginx/conf.d/cleberg.net.conf index a5e5b28..e9f2ad3 100644 --- a/linux/nginx/etc/nginx/conf.d/cleberg.net.conf +++ b/linux/nginx/etc/nginx/conf.d/cleberg.net.conf @@ -1,70 +1,34 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name www.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; - return 301 $scheme://cleberg.net$request_uri; } - server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - root /var/www/cleberg.net/; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - try_files $uri $uri/ =404; - } - - # fix: redirect blog & wiki posts from "/" to ".html" - location /blog/ { - rewrite ^/blog/((?!index)[^/]+)/(.*)$ /blog/$1.html permanent; - } - - location /wiki/ { - rewrite ^/wiki/((?!index)[^/]+)/(.*)$ /wiki/$1.html permanent; - } - - # fix: redirect atom.xml to feed.xml - location /atom.xml { - return 301 $scheme://$host/feed.xml; - } - - # fix: redirect salary page - location /blog/salary-transparency.html { - return 301 $scheme://$host/salary/; - } - # ---------------------------------------------------------------------- + location / { try_files $uri $uri/ =404; } + location /blog/ { rewrite ^/blog/((?!index)[^/]+)/(.*)$ /blog/$1.html permanent; } + location /wiki/ { rewrite ^/wiki/((?!index)[^/]+)/(.*)$ /wiki/$1.html permanent; } + location /atom.xml { return 301 $scheme://$host/feed.xml; } + location /blog/salary-transparency.html { return 301 $scheme://$host/salary/; } } -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- server { listen [::]:80; listen 80; server_name www.cleberg.net cleberg.net; - return 301 https://cleberg.net$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/cleberg.net_wildcard.conf b/linux/nginx/etc/nginx/conf.d/cleberg.net_wildcard.conf index cd0f842..b50bffc 100644 --- a/linux/nginx/etc/nginx/conf.d/cleberg.net_wildcard.conf +++ b/linux/nginx/etc/nginx/conf.d/cleberg.net_wildcard.conf @@ -4,27 +4,3 @@ server { server_name .cleberg.net; return 301 https://$host$request_uri; } - -server { - listen 443 ssl; - listen [::]:443 ssl; - http2 on; - - server_name .cleberg.net; - - include custom.d/tls/ssl_engine.conf; - include custom.d/tls/certificate_files.conf; - include custom.d/tls/policy_balanced.conf; - include custom.d/basic.conf; - - location / { - if ($backend_address = "") { - return 404; - } - - proxy_pass $backend_address; - include custom.d/reverse_proxy/basic.conf; - } - - include custom.d/security/robots_index_only.conf; -} diff --git a/linux/nginx/etc/nginx/conf.d/cv.conf b/linux/nginx/etc/nginx/conf.d/cv.conf index ff97174..7630e8c 100644 --- a/linux/nginx/etc/nginx/conf.d/cv.conf +++ b/linux/nginx/etc/nginx/conf.d/cv.conf @@ -1,37 +1,13 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name cv.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - root /var/www/cv/; autoindex on; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - try_files $uri $uri/ /index.html; - } - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name cv.cleberg.net; - - return 301 https://$host$request_uri; + location / { try_files $uri $uri/ /index.html; } } diff --git a/linux/nginx/etc/nginx/conf.d/ddns.conf b/linux/nginx/etc/nginx/conf.d/ddns.conf index 9915c1c..bf0d65d 100644 --- a/linux/nginx/etc/nginx/conf.d/ddns.conf +++ b/linux/nginx/etc/nginx/conf.d/ddns.conf @@ -1,44 +1,18 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name ddns.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location /authelia { - include custom.d/reverse_proxy/authelia.conf; - } - + location /authelia { include custom.d/reverse_proxy/authelia.conf; } location / { - set $upstream http://127.0.0.1:8097; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:8097; + proxy_pass $upstream; include custom.d/reverse_proxy/authelia_request.conf; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name ddns.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/default.conf b/linux/nginx/etc/nginx/conf.d/default.conf index 818a39d..e603a69 100644 --- a/linux/nginx/etc/nginx/conf.d/default.conf +++ b/linux/nginx/etc/nginx/conf.d/default.conf @@ -1,33 +1,17 @@ -# ---------------------------------------------------------------------- -# | Default behavior for unknown hosts | -# ---------------------------------------------------------------------- -# -# Drop requests for unknown hosts. -# -# If no default server is defined, Nginx will use the first found server. -# To prevent host header attacks, or other potential problems when an unknown -# server name is used in a request, it's recommended to drop the request -# returning 444 "No Response". - server { - listen [::]:443 ssl default_server; - listen 443 ssl default_server; - http2 on; - - server_name _; - - include custom.d/tls/ssl_engine.conf; - include custom.d/tls/certificate_files.conf; - include custom.d/tls/policy_balanced.conf; - - return 444; + listen [::]:443 ssl default_server; + listen 443 ssl default_server; + http2 on; + server_name _; + include custom.d/tls/ssl_engine.conf; + include custom.d/tls/certificate_files.conf; + include custom.d/tls/policy_balanced.conf; + return 444; } server { - listen [::]:80; - listen 80; - - server_name _; - - return 444; + listen [::]:80; + listen 80; + server_name _; + return 444; } diff --git a/linux/nginx/etc/nginx/conf.d/docker.conf b/linux/nginx/etc/nginx/conf.d/docker.conf index 4fab091..a3375c4 100644 --- a/linux/nginx/etc/nginx/conf.d/docker.conf +++ b/linux/nginx/etc/nginx/conf.d/docker.conf @@ -1,44 +1,18 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name docker.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location /authelia { - include custom.d/reverse_proxy/authelia.conf; - } - + location /authelia { include custom.d/reverse_proxy/authelia.conf; } location / { - set $upstream http://127.0.0.1:3777; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:3777; + proxy_pass $upstream; include custom.d/reverse_proxy/authelia_request.conf; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name docker.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/files.conf b/linux/nginx/etc/nginx/conf.d/files.conf index c96ab13..c267f12 100644 --- a/linux/nginx/etc/nginx/conf.d/files.conf +++ b/linux/nginx/etc/nginx/conf.d/files.conf @@ -1,40 +1,13 @@ -# ---------------------------------------------------------------------- -# | Config file for files.cleberg.net host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - - # The host name to respond to server_name files.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - root /var/www/files/; autoindex on; - - # Include the basic custom.d config set - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - try_files $uri $uri/ /index.html; - } - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure cleberg.net host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name files.cleberg.net; - - return 301 https://$host$request_uri; + location / { try_files $uri $uri/ /index.html; } } diff --git a/linux/nginx/etc/nginx/conf.d/gh.conf b/linux/nginx/etc/nginx/conf.d/gh.conf index 9b05a7f..f328756 100644 --- a/linux/nginx/etc/nginx/conf.d/gh.conf +++ b/linux/nginx/etc/nginx/conf.d/gh.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name gh.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://192.168.0.251:3039; - proxy_pass $upstream; - + set $upstream http://192.168.0.251:3039; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name gh.cleberg.net; - - return 301 https://$host$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/ha.conf b/linux/nginx/etc/nginx/conf.d/ha.conf index 63ed76c..97a5fba 100644 --- a/linux/nginx/etc/nginx/conf.d/ha.conf +++ b/linux/nginx/etc/nginx/conf.d/ha.conf @@ -1,46 +1,22 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name ha.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - set $upstream http://192.168.0.214:8123; - + set $upstream http://192.168.0.214:8123; location / { - proxy_pass $upstream; + proxy_pass $upstream; proxy_set_header X-Forwarded-For $remote_addr; } - location /api/websocket { proxy_pass $upstream; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name ha.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/hat.conf b/linux/nginx/etc/nginx/conf.d/hat.conf index 4d9da2c..a5710d8 100644 --- a/linux/nginx/etc/nginx/conf.d/hat.conf +++ b/linux/nginx/etc/nginx/conf.d/hat.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name hat.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://192.168.0.251:3991; - proxy_pass $upstream; - + set $upstream http://192.168.0.251:3991; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name hat.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/hn.conf b/linux/nginx/etc/nginx/conf.d/hn.conf index 93df37e..efbf913 100644 --- a/linux/nginx/etc/nginx/conf.d/hn.conf +++ b/linux/nginx/etc/nginx/conf.d/hn.conf @@ -1,27 +1,14 @@ server { - listen [::]:443 ssl; - listen 443 ssl; - http2 on; - - server_name hn.cleberg.net r3yfeffyj7ornpikojmw75u3sn2la7tqnmcmwgv2ov7if24sm5czqeid.onion; - root /var/www/hn/output/; - autoindex on; - add_header Onion-Location http://r3yfeffyj7ornpikojmw75u3sn2la7tqnmcmwgv2ov7if24sm5czqeid.onion; - - include custom.d/tls/ssl_engine.conf; - include custom.d/tls/certificate_files.conf; - include custom.d/tls/policy_balanced.conf; - include custom.d/basic.conf; - - location / { - try_files $uri $uri/ /index.html; - } -} - -server { - listen [::]:80; - listen 80; - server_name hn.cleberg.net; - - return 301 https://$host$request_uri; + listen [::]:443 ssl; + listen 443 ssl; + http2 on; + server_name hn.cleberg.net r3yfeffyj7ornpikojmw75u3sn2la7tqnmcmwgv2ov7if24sm5czqeid.onion; + root /var/www/hn/output/; + autoindex on; + add_header Onion-Location http://r3yfeffyj7ornpikojmw75u3sn2la7tqnmcmwgv2ov7if24sm5czqeid.onion; + include custom.d/tls/ssl_engine.conf; + include custom.d/tls/certificate_files.conf; + include custom.d/tls/policy_balanced.conf; + include custom.d/basic.conf; + location / { try_files $uri $uri/ /index.html; } } diff --git a/linux/nginx/etc/nginx/conf.d/img.conf b/linux/nginx/etc/nginx/conf.d/img.conf index 10c0fba..a6c32f3 100644 --- a/linux/nginx/etc/nginx/conf.d/img.conf +++ b/linux/nginx/etc/nginx/conf.d/img.conf @@ -1,37 +1,13 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name img.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - root /var/www/img/; autoindex on; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - try_files $uri $uri/ =404; - } - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name img.cleberg.net; - - return 301 https://img.cleberg.net$request_uri; + location / { try_files $uri $uri/ =404; } } diff --git a/linux/nginx/etc/nginx/conf.d/irc.conf b/linux/nginx/etc/nginx/conf.d/irc.conf index 0d8af19..dbd45b7 100644 --- a/linux/nginx/etc/nginx/conf.d/irc.conf +++ b/linux/nginx/etc/nginx/conf.d/irc.conf @@ -1,44 +1,18 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name irc.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location /authelia { - include custom.d/reverse_proxy/authelia.conf; - } - + location /authelia { include custom.d/reverse_proxy/authelia.conf; } location / { - set $upstream http://192.168.0.251:9900; - proxy_pass $upstream; - + set $upstream http://192.168.0.251:9900; + proxy_pass $upstream; include custom.d/reverse_proxy/authelia_request.conf; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name irc.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/ld.conf b/linux/nginx/etc/nginx/conf.d/ld.conf index 5c03fca..9f0b345 100644 --- a/linux/nginx/etc/nginx/conf.d/ld.conf +++ b/linux/nginx/etc/nginx/conf.d/ld.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name ld.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:3004; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:3004; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name ld.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/lemmy.conf b/linux/nginx/etc/nginx/conf.d/lemmy.conf index 1e3fffa..dc165f9 100644 --- a/linux/nginx/etc/nginx/conf.d/lemmy.conf +++ b/linux/nginx/etc/nginx/conf.d/lemmy.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name lemmy.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:10633; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:10633; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name lemmy.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/lt.conf b/linux/nginx/etc/nginx/conf.d/lt.conf index 620f02b..f408dc4 100644 --- a/linux/nginx/etc/nginx/conf.d/lt.conf +++ b/linux/nginx/etc/nginx/conf.d/lt.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name lt.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:5000; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:5000; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name lt.cleberg.net; - - return 301 https://$host$request_uri; -} + include custom.d/security/robots_index_only.conf; +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/mz.conf b/linux/nginx/etc/nginx/conf.d/mz.conf index df7d7b2..7773d73 100644 --- a/linux/nginx/etc/nginx/conf.d/mz.conf +++ b/linux/nginx/etc/nginx/conf.d/mz.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name mz.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:3474; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:3474; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name mz.cleberg.net; - - return 301 https://$host$request_uri; -} + include custom.d/security/robots_index_only.conf; +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/no-ssl.default.conf b/linux/nginx/etc/nginx/conf.d/no-ssl.default.conf index 01ee2c6..de6b2d7 100644 --- a/linux/nginx/etc/nginx/conf.d/no-ssl.default.conf +++ b/linux/nginx/etc/nginx/conf.d/no-ssl.default.conf @@ -1,27 +1,6 @@ -# ---------------------------------------------------------------------- -# | Default behavior for unknown hosts | -# ---------------------------------------------------------------------- -# -# Drop requests for unknown hosts. -# -# If no default server is defined, Nginx will use the first found server. -# To prevent host header attacks, or other potential problems when an unknown -# server name is used in a request, it's recommended to drop the request -# returning 444 "No Response". -# -# (1) In production, only secure hosts should be used (all `no-ssl` disabled). -# If so, redirect first ANY request to a secure connection before handling -# it, even if the host is unknown. -# -# https://observatory.mozilla.org/faq/ - server { - listen [::]:80 default_server deferred; - listen 80 default_server deferred; - - server_name _; - - # (1) - return 301 https://$host$request_uri; - # return 444; + listen [::]:80 default_server deferred; + listen 80 default_server deferred; + server_name _; + return 301 https://$host$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/office.conf b/linux/nginx/etc/nginx/conf.d/office.conf index 7bf6653..ef06300 100644 --- a/linux/nginx/etc/nginx/conf.d/office.conf +++ b/linux/nginx/etc/nginx/conf.d/office.conf @@ -1,35 +1,12 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name office.cleberg.net; root /var/www/office/; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - try_files $uri $uri/ /index.html; - } - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name office.cleberg.net; - - return 301 https://$host$request_uri; -} + location / { try_files $uri $uri/ /index.html; } +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/org.conf b/linux/nginx/etc/nginx/conf.d/org.conf index 7b1effc..9b82411 100644 --- a/linux/nginx/etc/nginx/conf.d/org.conf +++ b/linux/nginx/etc/nginx/conf.d/org.conf @@ -1,35 +1,12 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name org.cleberg.net; root /var/www/org/; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - try_files $uri $uri/ /index.html; - } - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name org.cleberg.net; - - return 301 https://$host$request_uri; -} + location / { try_files $uri $uri/ /index.html; } +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/paste.conf b/linux/nginx/etc/nginx/conf.d/paste.conf index 9164097..0a71a68 100644 --- a/linux/nginx/etc/nginx/conf.d/paste.conf +++ b/linux/nginx/etc/nginx/conf.d/paste.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name paste.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:8084; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:8084; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name paste.cleberg.net; - - return 301 https://$host$request_uri; -} + include custom.d/security/robots_index_only.conf; +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/pb.conf b/linux/nginx/etc/nginx/conf.d/pb.conf index 4adbc0a..4423248 100644 --- a/linux/nginx/etc/nginx/conf.d/pb.conf +++ b/linux/nginx/etc/nginx/conf.d/pb.conf @@ -1,39 +1,15 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name pb.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:8745; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:8745; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - # include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name pb.cleberg.net; - - return 301 https://$host$request_uri; -} +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/pgp.conf b/linux/nginx/etc/nginx/conf.d/pgp.conf index b4e76d1..a0c54de 100644 --- a/linux/nginx/etc/nginx/conf.d/pgp.conf +++ b/linux/nginx/etc/nginx/conf.d/pgp.conf @@ -1,37 +1,13 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name pgp.cleberg.net; root /var/www/pgp/; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - try_files $uri $uri/ /index.html; - } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name pgp.cleberg.net; - - return 301 https://$host$request_uri; + location / { try_files $uri $uri/ /index.html; } + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/photos.conf b/linux/nginx/etc/nginx/conf.d/photos.conf index 1a1e41a..c264da3 100644 --- a/linux/nginx/etc/nginx/conf.d/photos.conf +++ b/linux/nginx/etc/nginx/conf.d/photos.conf @@ -1,54 +1,23 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name photos.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - # allow large file uploads client_max_body_size 50000M; - - # Set headers proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - - # enable websockets: http://nginx.org/en/docs/http/websocket.html proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_redirect off; - - # set timeout proxy_read_timeout 600s; proxy_send_timeout 600s; send_timeout 600s; - - location / { - proxy_pass http://127.0.0.1:2283; - } - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name photos.cleberg.net; - - return 301 https://$host$request_uri; -} + location / { proxy_pass http://127.0.0.1:2283; } +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/pin.conf b/linux/nginx/etc/nginx/conf.d/pin.conf index 228cfd0..0ce6be5 100644 --- a/linux/nginx/etc/nginx/conf.d/pin.conf +++ b/linux/nginx/etc/nginx/conf.d/pin.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name pin.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:8086; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:8086; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name pin.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/piped.conf b/linux/nginx/etc/nginx/conf.d/piped.conf index 8efa6aa..022c8e8 100644 --- a/linux/nginx/etc/nginx/conf.d/piped.conf +++ b/linux/nginx/etc/nginx/conf.d/piped.conf @@ -1,40 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name piped.cleberg.net pipedapi.cleberg.net pipedproxy.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:8077; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:8077; + proxy_pass $upstream; proxy_set_header Host $host; - # include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name piped.cleberg.net pipedapi.cleberg.net pipedproxy.cleberg.net; - - return 301 https://$host$request_uri; -} + include custom.d/security/robots_index_only.conf; +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/projects.conf b/linux/nginx/etc/nginx/conf.d/projects.conf index 4ea0646..f04c72b 100644 --- a/linux/nginx/etc/nginx/conf.d/projects.conf +++ b/linux/nginx/etc/nginx/conf.d/projects.conf @@ -1,36 +1,13 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name projects.cleberg.net; root /var/www/projects/; autoindex on; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - try_files $uri $uri/ /index.html; - } - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name projects.cleberg.net; - - return 301 https://$host$request_uri; + location / { try_files $uri $uri/ /index.html; } } diff --git a/linux/nginx/etc/nginx/conf.d/rd.conf b/linux/nginx/etc/nginx/conf.d/rd.conf index bea88da..765f67e 100644 --- a/linux/nginx/etc/nginx/conf.d/rd.conf +++ b/linux/nginx/etc/nginx/conf.d/rd.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name rd.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:5758; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:5758; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name rd.cleberg.net; - - return 301 https://$host$request_uri; -} + include custom.d/security/robots_index_only.conf; +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/reminiscecleberg.com.conf b/linux/nginx/etc/nginx/conf.d/reminiscecleberg.com.conf index 7901c58..9a173d1 100644 --- a/linux/nginx/etc/nginx/conf.d/reminiscecleberg.com.conf +++ b/linux/nginx/etc/nginx/conf.d/reminiscecleberg.com.conf @@ -1,20 +1,13 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name www.reminiscecleberg.com; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/policy_balanced.conf; - # include custom.d/tls/certificate_files.conf; ssl_certificate /etc/letsencrypt/live/reminiscecleberg.com/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/reminiscecleberg.com/privkey.pem; ssl_trusted_certificate /etc/letsencrypt/live/reminiscecleberg.com/chain.pem; - return 301 $scheme://reminiscecleberg.com$request_uri; } @@ -23,34 +16,20 @@ server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name reminiscecleberg.com; root /var/www/reminiscecleberg.com/; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - # include custom.d/tls/certificate_files.conf; ssl_certificate /etc/letsencrypt/live/reminiscecleberg.com/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/reminiscecleberg.com/privkey.pem; ssl_trusted_certificate /etc/letsencrypt/live/reminiscecleberg.com/chain.pem; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location / { - try_files $uri $uri/ =404; - } - # ---------------------------------------------------------------------- + location / { try_files $uri $uri/ =404; } } -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- server { listen [::]:80; listen 80; server_name www.reminiscecleberg.com reminiscecleberg.com; - return 301 https://reminiscecleberg.com$request_uri; } diff --git a/linux/nginx/etc/nginx/conf.d/rimgo.conf b/linux/nginx/etc/nginx/conf.d/rimgo.conf index 2d1272f..9ae6975 100644 --- a/linux/nginx/etc/nginx/conf.d/rimgo.conf +++ b/linux/nginx/etc/nginx/conf.d/rimgo.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name rimgo.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:3869; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:3869; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name rimgo.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/rl.conf b/linux/nginx/etc/nginx/conf.d/rl.conf index d00f563..8492361 100644 --- a/linux/nginx/etc/nginx/conf.d/rl.conf +++ b/linux/nginx/etc/nginx/conf.d/rl.conf @@ -1,44 +1,18 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name rl.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location /authelia { - include custom.d/reverse_proxy/authelia.conf; - } - + location /authelia { include custom.d/reverse_proxy/authelia.conf; } location / { - set $upstream http://192.168.0.251:8983; - proxy_pass $upstream; - + set $upstream http://192.168.0.251:8983; + proxy_pass $upstream; include custom.d/reverse_proxy/authelia_request.conf; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name rl.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/rss.conf b/linux/nginx/etc/nginx/conf.d/rss.conf index a097b50..0a74a72 100644 --- a/linux/nginx/etc/nginx/conf.d/rss.conf +++ b/linux/nginx/etc/nginx/conf.d/rss.conf @@ -1,31 +1,15 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- -upstream freshrss { - server 192.168.0.251:8081; - keepalive 64; -} - +upstream freshrss { server 192.168.0.251:8081; keepalive 64; } server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name rss.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - proxy_pass http://freshrss/; - - # include custom.d/reverse_proxy/basic.conf; - + proxy_pass http://freshrss/; add_header X-Frame-Options SAMEORIGIN; add_header X-XSS-Protection "1; mode=block"; proxy_redirect off; @@ -36,23 +20,8 @@ server { proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Port $server_port; proxy_read_timeout 90; - - # Forward the Authorization header for the Google Reader API. proxy_set_header Authorization $http_authorization; proxy_pass_header Authorization; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name rss.cleberg.net; - - return 301 https://$host$request_uri; -} + include custom.d/security/robots_index_only.conf; +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/search.conf b/linux/nginx/etc/nginx/conf.d/search.conf index 8ba49b0..3fc35f6 100644 --- a/linux/nginx/etc/nginx/conf.d/search.conf +++ b/linux/nginx/etc/nginx/conf.d/search.conf @@ -1,44 +1,20 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name search.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:9191; - proxy_pass $upstream; - - # include custom.d/reverse_proxy/basic.conf; + set $upstream http://127.0.0.1:9191; + proxy_pass $upstream; proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; proxy_http_version 1.1; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name search.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/send.conf b/linux/nginx/etc/nginx/conf.d/send.conf index 0314bb5..cbdc71d 100644 --- a/linux/nginx/etc/nginx/conf.d/send.conf +++ b/linux/nginx/etc/nginx/conf.d/send.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name send.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://192.168.0.251:1443; - proxy_pass $upstream; - + set $upstream http://192.168.0.251:1443; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name send.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } diff --git a/linux/nginx/etc/nginx/conf.d/slash.conf b/linux/nginx/etc/nginx/conf.d/slash.conf index b7489dd..702cca4 100644 --- a/linux/nginx/etc/nginx/conf.d/slash.conf +++ b/linux/nginx/etc/nginx/conf.d/slash.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name slash.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://192.168.0.251:5231; - proxy_pass $upstream; - + set $upstream http://192.168.0.251:5231; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name slash.cleberg.net; - - return 301 https://$host$request_uri; -} + include custom.d/security/robots_index_only.conf; +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/small.conf b/linux/nginx/etc/nginx/conf.d/small.conf index 1bdb145..46f1099 100644 --- a/linux/nginx/etc/nginx/conf.d/small.conf +++ b/linux/nginx/etc/nginx/conf.d/small.conf @@ -1,39 +1,16 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name small.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- location / { - set $upstream http://127.0.0.1:8002; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:8002; + proxy_pass $upstream; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name small.cleberg.net; - - return 301 https://$host$request_uri; -} + include custom.d/security/robots_index_only.conf; +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/ssh.conf b/linux/nginx/etc/nginx/conf.d/ssh.conf index 726a0d8..b8904ed 100644 --- a/linux/nginx/etc/nginx/conf.d/ssh.conf +++ b/linux/nginx/etc/nginx/conf.d/ssh.conf @@ -1,44 +1,18 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name ssh.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location /authelia { - include custom.d/reverse_proxy/authelia.conf; - } - + location /authelia { include custom.d/reverse_proxy/authelia.conf; } location / { - set $upstream http://127.0.0.1:8169; - proxy_pass $upstream; - + set $upstream http://127.0.0.1:8169; + proxy_pass $upstream; include custom.d/reverse_proxy/authelia_request.conf; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name ssh.cleberg.net; - - return 301 https://$host$request_uri; -} + include custom.d/security/robots_index_only.conf; +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/teddit.conf b/linux/nginx/etc/nginx/conf.d/teddit.conf index f96bd34..ad62af3 100644 --- a/linux/nginx/etc/nginx/conf.d/teddit.conf +++ b/linux/nginx/etc/nginx/conf.d/teddit.conf @@ -1,44 +1,18 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name teddit.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location /authelia { - include custom.d/reverse_proxy/authelia.conf; - } - + location /authelia { include custom.d/reverse_proxy/authelia.conf; } location / { - set $upstream http://192.168.0.251:8181; - proxy_pass $upstream; - + set $upstream http://192.168.0.251:8181; + proxy_pass $upstream; include custom.d/reverse_proxy/authelia_request.conf; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name teddit.cleberg.net; - - return 301 https://$host$request_uri; -} + include custom.d/security/robots_index_only.conf; +} \ No newline at end of file diff --git a/linux/nginx/etc/nginx/conf.d/wyl.conf b/linux/nginx/etc/nginx/conf.d/wyl.conf index da20b69..092f110 100644 --- a/linux/nginx/etc/nginx/conf.d/wyl.conf +++ b/linux/nginx/etc/nginx/conf.d/wyl.conf @@ -1,44 +1,18 @@ -# ---------------------------------------------------------------------- -# | Config file for host | -# ---------------------------------------------------------------------- server { listen [::]:443 ssl; listen 443 ssl; http2 on; - server_name wyl.cleberg.net; - include custom.d/tls/ssl_engine.conf; include custom.d/tls/certificate_files.conf; include custom.d/tls/policy_balanced.conf; include custom.d/basic.conf; - - # ---------------------------------------------------------------------- - # | Custom rules & config for specific website | - # ---------------------------------------------------------------------- - location /authelia { - include custom.d/reverse_proxy/authelia.conf; - } - + location /authelia { include custom.d/reverse_proxy/authelia.conf; } location / { - set $upstream http://192.168.0.251:8840; - proxy_pass $upstream; - + set $upstream http://192.168.0.251:8840; + proxy_pass $upstream; include custom.d/reverse_proxy/authelia_request.conf; include custom.d/reverse_proxy/basic.conf; } - - include custom.d/security/robots_index_only.conf; - # ---------------------------------------------------------------------- -} - -# ---------------------------------------------------------------------- -# | Config file for non-secure host | -# ---------------------------------------------------------------------- -server { - listen [::]:80; - listen 80; - server_name wyl.cleberg.net; - - return 301 https://$host$request_uri; + include custom.d/security/robots_index_only.conf; } -- cgit v1.2.3