From 2a81cc6917a83e587f10a37f8d024a353352a151 Mon Sep 17 00:00:00 2001 From: creme Date: Thu, 16 Jan 2020 16:02:54 +0100 Subject: [PATCH] change nginx confs to tabs --- etc/nginx/sites-available/envs.net.conf | 20 ++--- etc/nginx/sites-available/ip.envs.net.conf | 12 +-- etc/nginx/sites-available/ip.envs.sh.conf | 78 +++++++++---------- .../sites-available/matrix.envs.net.conf | 14 ++-- etc/nginx/sites-available/searx.envs.net.conf | 14 ++-- 5 files changed, 69 insertions(+), 69 deletions(-) diff --git a/etc/nginx/sites-available/envs.net.conf b/etc/nginx/sites-available/envs.net.conf index 1aa4612..d65d719 100644 --- a/etc/nginx/sites-available/envs.net.conf +++ b/etc/nginx/sites-available/envs.net.conf @@ -59,18 +59,18 @@ server { } location /_matrix { - include proxy_params; - proxy_ssl_name $http_host; - proxy_ssl_server_name on; - proxy_pass https://matrix.envs.net; - } + include proxy_params; + proxy_ssl_name $http_host; + proxy_ssl_server_name on; + proxy_pass https://matrix.envs.net; + } location /_synapse { - include proxy_params; - proxy_ssl_name $http_host; - proxy_ssl_server_name on; - proxy_pass https://matrix.envs.net; - } + include proxy_params; + proxy_ssl_name $http_host; + proxy_ssl_server_name on; + proxy_pass https://matrix.envs.net; + } # users location ~ ^/(~|u/)(?[\w-]+)(?/.*)?$ { diff --git a/etc/nginx/sites-available/ip.envs.net.conf b/etc/nginx/sites-available/ip.envs.net.conf index 22208c1..5aa7c8a 100644 --- a/etc/nginx/sites-available/ip.envs.net.conf +++ b/etc/nginx/sites-available/ip.envs.net.conf @@ -7,9 +7,9 @@ server { error_log /var/log/nginx/ip.envs.net-error.log crit; - location / { - return 301 https://ip.envs.net/; - } + location / { + return 301 https://ip.envs.net/; + } } server { include snippets/listen_local.conf; @@ -38,9 +38,9 @@ server { error_log /var/log/nginx/ip.envs.net-error.log crit; - location / { - return 301 https://ip.envs.net/; - } + location / { + return 301 https://ip.envs.net/; + } } server { include snippets/listen_local_ssl.conf; diff --git a/etc/nginx/sites-available/ip.envs.sh.conf b/etc/nginx/sites-available/ip.envs.sh.conf index b10c25a..3e7f458 100644 --- a/etc/nginx/sites-available/ip.envs.sh.conf +++ b/etc/nginx/sites-available/ip.envs.sh.conf @@ -1,61 +1,61 @@ ### IP.ENVS.SH - local ### server { - include snippets/listen_local.conf; - include snippets/listen.conf; + include snippets/listen_local.conf; + include snippets/listen.conf; # include snippets/ddos_def.conf; - server_name whois.envs.sh ifconfig.envs.sh ifconf.envs.sh ping.envs.sh checkip.envs.sh ipconfig.envs.sh ipconf.envs.sh; + server_name whois.envs.sh ifconfig.envs.sh ifconf.envs.sh ping.envs.sh checkip.envs.sh ipconfig.envs.sh ipconf.envs.sh; - error_log /var/log/nginx/ip.envs.net-error.log crit; + error_log /var/log/nginx/ip.envs.net-error.log crit; - location / { - return 301 https://ip.envs.sh/; - } + location / { + return 301 https://ip.envs.sh/; + } } server { - include snippets/listen_local.conf; - include snippets/listen.conf; + include snippets/listen_local.conf; + include snippets/listen.conf; # include snippets/ddos_def.conf; - server_name ip.envs.sh; + server_name ip.envs.sh; - error_log /var/log/nginx/ip.envs.net-error.log crit; - - location / { - include proxy_params; - proxy_pass http://127.0.0.1:8080; - } + error_log /var/log/nginx/ip.envs.net-error.log crit; + + location / { + include proxy_params; + proxy_pass http://127.0.0.1:8080; + } } server { - include snippets/listen_local_ssl.conf; - include snippets/listen_ssl.conf; + include snippets/listen_local_ssl.conf; + include snippets/listen_ssl.conf; # include snippets/ddos_def.conf; - server_name whois.envs.sh ifconfig.envs.sh ifconf.envs.sh ping.envs.sh checkip.envs.sh ipconfig.envs.sh ipconf.envs.sh; - - include snippets/ssl.conf; - include ssl/envs_sh_wild.conf; - include snippets/local_ssl_header.conf; + server_name whois.envs.sh ifconfig.envs.sh ifconf.envs.sh ping.envs.sh checkip.envs.sh ipconfig.envs.sh ipconf.envs.sh; - error_log /var/log/nginx/ip.envs.net-error.log crit; + include snippets/ssl.conf; + include ssl/envs_sh_wild.conf; + include snippets/local_ssl_header.conf; - location / { - return 301 https://ip.envs.sh/; - } + error_log /var/log/nginx/ip.envs.net-error.log crit; + + location / { + return 301 https://ip.envs.sh/; + } } server { - include snippets/listen_local_ssl.conf; - include snippets/listen_ssl.conf; + include snippets/listen_local_ssl.conf; + include snippets/listen_ssl.conf; # include snippets/ddos_def.conf; - server_name ip.envs.sh; - - include snippets/ssl.conf; - include ssl/envs_sh_wild.conf; - include snippets/local_ssl_header.conf; + server_name ip.envs.sh; - error_log /var/log/nginx/ip.envs.net-error.log crit; + include snippets/ssl.conf; + include ssl/envs_sh_wild.conf; + include snippets/local_ssl_header.conf; - location / { - include proxy_params; - proxy_pass http://127.0.0.1:8080; - } + error_log /var/log/nginx/ip.envs.net-error.log crit; + + location / { + include proxy_params; + proxy_pass http://127.0.0.1:8080; + } } diff --git a/etc/nginx/sites-available/matrix.envs.net.conf b/etc/nginx/sites-available/matrix.envs.net.conf index 153ea3e..94dbe32 100644 --- a/etc/nginx/sites-available/matrix.envs.net.conf +++ b/etc/nginx/sites-available/matrix.envs.net.conf @@ -2,7 +2,7 @@ server { include snippets/listen.conf; # include snippets/ddos_mid.conf; - server_name matrix.envs.net riot.envs.net; + server_name matrix.envs.net riot.envs.net; return 307 https://$host$request_uri; } @@ -11,17 +11,17 @@ server { server { include snippets/listen_ssl.conf; # include snippets/ddos_mid.conf; - server_name matrix.envs.net riot.envs.net; + server_name matrix.envs.net riot.envs.net; - include snippets/ssl.conf; + include snippets/ssl.conf; include ssl/envs_net_wild.conf; - error_log /var/log/nginx/matrix.envs.net-error.log crit; + error_log /var/log/nginx/matrix.envs.net-error.log crit; - location / { + location / { include proxy_params; proxy_ssl_name $http_host; proxy_ssl_server_name on; - proxy_pass https://matrix.envs.net; - } + proxy_pass https://matrix.envs.net; + } } diff --git a/etc/nginx/sites-available/searx.envs.net.conf b/etc/nginx/sites-available/searx.envs.net.conf index 4eaa9fc..0cea39e 100644 --- a/etc/nginx/sites-available/searx.envs.net.conf +++ b/etc/nginx/sites-available/searx.envs.net.conf @@ -2,7 +2,7 @@ server { include snippets/listen.conf; # include snippets/ddos_mid.conf; - server_name searx.envs.net search.envs.net; + server_name searx.envs.net search.envs.net; return 307 https://$host$request_uri; } @@ -11,17 +11,17 @@ server { server { include snippets/listen_ssl.conf; # include snippets/ddos_mid.conf; - server_name searx.envs.net search.envs.net; + server_name searx.envs.net search.envs.net; - include snippets/ssl.conf; + include snippets/ssl.conf; include ssl/envs_net_wild.conf; - error_log /var/log/nginx/searx.envs.net-error.log crit; + error_log /var/log/nginx/searx.envs.net-error.log crit; - location / { + location / { include proxy_params; proxy_ssl_name $http_host; proxy_ssl_server_name on; - proxy_pass https://searx.envs.net; - } + proxy_pass https://searx.envs.net; + } }