From b6fa1b864fe2e43d9143010c56821c5dfd59e8d3 Mon Sep 17 00:00:00 2001 From: Arthur Lu Date: Wed, 26 Apr 2023 15:10:02 -0700 Subject: [PATCH] convert indentation to tabs --- mime.types | 158 +++++++++++++++++++------------------- sites/client.conf | 22 +++--- sites/default.conf | 8 +- sites/homepage.conf | 14 ++-- sites/ldap.conf | 14 ++-- sites/mail.conf | 14 ++-- sites/nextcloud.conf | 14 ++-- sites/opns.conf | 14 ++-- sites/pve.conf | 14 ++-- sites/redirect.conf | 6 +- sites/root.conf | 14 ++-- sites/status.conf | 14 ++-- sites/wiki.conf | 14 ++-- snippets/error-pages.conf | 4 +- snippets/ssl-params.conf | 4 +- 15 files changed, 164 insertions(+), 164 deletions(-) diff --git a/mime.types b/mime.types index 89be9a4..0643931 100644 --- a/mime.types +++ b/mime.types @@ -1,89 +1,89 @@ types { - text/html html htm shtml; - text/css css; - text/xml xml; - image/gif gif; - image/jpeg jpeg jpg; - application/javascript js; - application/atom+xml atom; - application/rss+xml rss; + text/html html htm shtml; + text/css css; + text/xml xml; + image/gif gif; + image/jpeg jpeg jpg; + application/javascript js; + application/atom+xml atom; + application/rss+xml rss; - text/mathml mml; - text/plain txt; - text/vnd.sun.j2me.app-descriptor jad; - text/vnd.wap.wml wml; - text/x-component htc; + text/mathml mml; + text/plain txt; + text/vnd.sun.j2me.app-descriptor jad; + text/vnd.wap.wml wml; + text/x-component htc; - image/png png; - image/tiff tif tiff; - image/vnd.wap.wbmp wbmp; - image/x-icon ico; - image/x-jng jng; - image/x-ms-bmp bmp; - image/svg+xml svg svgz; - image/webp webp; + image/png png; + image/tiff tif tiff; + image/vnd.wap.wbmp wbmp; + image/x-icon ico; + image/x-jng jng; + image/x-ms-bmp bmp; + image/svg+xml svg svgz; + image/webp webp; - application/font-woff woff; - application/java-archive jar war ear; - application/json json; - application/mac-binhex40 hqx; - application/msword doc; - application/pdf pdf; - application/postscript ps eps ai; - application/rtf rtf; - application/vnd.apple.mpegurl m3u8; - application/vnd.ms-excel xls; - application/vnd.ms-fontobject eot; - application/vnd.ms-powerpoint ppt; - application/vnd.wap.wmlc wmlc; - application/vnd.google-earth.kml+xml kml; - application/vnd.google-earth.kmz kmz; - application/x-7z-compressed 7z; - application/x-cocoa cco; - application/x-java-archive-diff jardiff; - application/x-java-jnlp-file jnlp; - application/x-makeself run; - application/x-perl pl pm; - application/x-pilot prc pdb; - application/x-rar-compressed rar; - application/x-redhat-package-manager rpm; - application/x-sea sea; - application/x-shockwave-flash swf; - application/x-stuffit sit; - application/x-tcl tcl tk; - application/x-x509-ca-cert der pem crt; - application/x-xpinstall xpi; - application/xhtml+xml xhtml; - application/xspf+xml xspf; - application/zip zip; + application/font-woff woff; + application/java-archive jar war ear; + application/json json; + application/mac-binhex40 hqx; + application/msword doc; + application/pdf pdf; + application/postscript ps eps ai; + application/rtf rtf; + application/vnd.apple.mpegurl m3u8; + application/vnd.ms-excel xls; + application/vnd.ms-fontobject eot; + application/vnd.ms-powerpoint ppt; + application/vnd.wap.wmlc wmlc; + application/vnd.google-earth.kml+xml kml; + application/vnd.google-earth.kmz kmz; + application/x-7z-compressed 7z; + application/x-cocoa cco; + application/x-java-archive-diff jardiff; + application/x-java-jnlp-file jnlp; + application/x-makeself run; + application/x-perl pl pm; + application/x-pilot prc pdb; + application/x-rar-compressed rar; + application/x-redhat-package-manager rpm; + application/x-sea sea; + application/x-shockwave-flash swf; + application/x-stuffit sit; + application/x-tcl tcl tk; + application/x-x509-ca-cert der pem crt; + application/x-xpinstall xpi; + application/xhtml+xml xhtml; + application/xspf+xml xspf; + application/zip zip; - application/octet-stream bin exe dll; - application/octet-stream deb; - application/octet-stream dmg; - application/octet-stream iso img; - application/octet-stream msi msp msm; + application/octet-stream bin exe dll; + application/octet-stream deb; + application/octet-stream dmg; + application/octet-stream iso img; + application/octet-stream msi msp msm; - application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; - application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; - application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; + application/vnd.openxmlformats-officedocument.wordprocessingml.document docx; + application/vnd.openxmlformats-officedocument.spreadsheetml.sheet xlsx; + application/vnd.openxmlformats-officedocument.presentationml.presentation pptx; - audio/midi mid midi kar; - audio/mpeg mp3; - audio/ogg ogg; - audio/x-m4a m4a; - audio/x-realaudio ra; + audio/midi mid midi kar; + audio/mpeg mp3; + audio/ogg ogg; + audio/x-m4a m4a; + audio/x-realaudio ra; - video/3gpp 3gpp 3gp; - video/mp2t ts; - video/mp4 mp4; - video/mpeg mpeg mpg; - video/quicktime mov; - video/webm webm; - video/x-flv flv; - video/x-m4v m4v; - video/x-mng mng; - video/x-ms-asf asx asf; - video/x-ms-wmv wmv; - video/x-msvideo avi; + video/3gpp 3gpp 3gp; + video/mp2t ts; + video/mp4 mp4; + video/mpeg mpeg mpg; + video/quicktime mov; + video/webm webm; + video/x-flv flv; + video/x-m4v m4v; + video/x-mng mng; + video/x-ms-asf asx asf; + video/x-ms-wmv wmv; + video/x-msvideo avi; } diff --git a/sites/client.conf b/sites/client.conf index a726d56..a7f4d33 100644 --- a/sites/client.conf +++ b/sites/client.conf @@ -1,14 +1,14 @@ server { - listen 443 ssl http2; - server_name client.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; - location / { + listen 443 ssl http2; + server_name client.tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; + location / { include /etc/nginx/snippets/error-pages.conf; - proxy_pass http://proxmoxaas.dmz:8080; - include /etc/nginx/snippets/proxy-params.conf; - } - location /api/ { - proxy_pass http://proxmoxaas.dmz:80; - include /etc/nginx/snippets/proxy-params.conf; - } + proxy_pass http://proxmoxaas.dmz:8080; + include /etc/nginx/snippets/proxy-params.conf; + } + location /api/ { + proxy_pass http://proxmoxaas.dmz:80; + include /etc/nginx/snippets/proxy-params.conf; + } } diff --git a/sites/default.conf b/sites/default.conf index 4578c5b..1c5d74b 100644 --- a/sites/default.conf +++ b/sites/default.conf @@ -1,6 +1,6 @@ server { - listen 443 ssl http2 default_server; - server_name *.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; - return 301 https://tronnet.net; + listen 443 ssl http2 default_server; + server_name *.tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; + return 301 https://tronnet.net; } diff --git a/sites/homepage.conf b/sites/homepage.conf index 80b4f0a..75ea570 100644 --- a/sites/homepage.conf +++ b/sites/homepage.conf @@ -1,10 +1,10 @@ server { - listen 443 ssl http2; - server_name tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + listen 443 ssl http2; + server_name tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; include /etc/nginx/snippets/error-pages.conf; - location / { - proxy_pass http://sites.dmz:80; - include /etc/nginx/snippets/proxy-params.conf; - } + location / { + proxy_pass http://sites.dmz:80; + include /etc/nginx/snippets/proxy-params.conf; + } } diff --git a/sites/ldap.conf b/sites/ldap.conf index 5b03479..d88fcf0 100644 --- a/sites/ldap.conf +++ b/sites/ldap.conf @@ -1,10 +1,10 @@ server { - listen 443 ssl http2; - server_name ldap.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + listen 443 ssl http2; + server_name ldap.tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; include /etc/nginx/snippets/error-pages.conf; - location / { - proxy_pass http://ldap.dmz:80; - include /etc/nginx/snippets/proxy-params.conf; - } + location / { + proxy_pass http://ldap.dmz:80; + include /etc/nginx/snippets/proxy-params.conf; + } } diff --git a/sites/mail.conf b/sites/mail.conf index 00ca627..d5933b8 100644 --- a/sites/mail.conf +++ b/sites/mail.conf @@ -1,10 +1,10 @@ server { - listen 443 ssl http2; - server_name mail.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + listen 443 ssl http2; + server_name mail.tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; include /etc/nginx/snippets/error-pages.conf; - location / { - proxy_pass https://mail2.dmz; - include /etc/nginx/snippets/proxy-params.conf; - } + location / { + proxy_pass https://mail2.dmz; + include /etc/nginx/snippets/proxy-params.conf; + } } diff --git a/sites/nextcloud.conf b/sites/nextcloud.conf index 803632b..659c428 100644 --- a/sites/nextcloud.conf +++ b/sites/nextcloud.conf @@ -1,10 +1,10 @@ server { - listen 443 ssl http2; - server_name nextcloud.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + listen 443 ssl http2; + server_name nextcloud.tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; include /etc/nginx/snippets/error-pages.conf; - location / { - proxy_pass http://nextcloud2.dmz:11000; - include /etc/nginx/snippets/proxy-params.conf; - } + location / { + proxy_pass http://nextcloud2.dmz:11000; + include /etc/nginx/snippets/proxy-params.conf; + } } diff --git a/sites/opns.conf b/sites/opns.conf index c10332e..fad7c36 100644 --- a/sites/opns.conf +++ b/sites/opns.conf @@ -1,10 +1,10 @@ server { - listen 443 ssl http2; - server_name opns.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + listen 443 ssl http2; + server_name opns.tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; include /etc/nginx/snippets/error-pages.conf; - location / { - proxy_pass https://10.0.0.1:10443; - include /etc/nginx/snippets/proxy-params.conf; - } + location / { + proxy_pass https://10.0.0.1:10443; + include /etc/nginx/snippets/proxy-params.conf; + } } diff --git a/sites/pve.conf b/sites/pve.conf index 6e3149b..b85b69d 100644 --- a/sites/pve.conf +++ b/sites/pve.conf @@ -1,9 +1,9 @@ server { - listen 443 ssl http2; - server_name pve.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; - location / { - proxy_pass https://geigatron-0-pve.tn:8006; - include /etc/nginx/snippets/proxy-params.conf; - } + listen 443 ssl http2; + server_name pve.tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; + location / { + proxy_pass https://geigatron-0-pve.tn:8006; + include /etc/nginx/snippets/proxy-params.conf; + } } diff --git a/sites/redirect.conf b/sites/redirect.conf index 32b341c..9ec4fc4 100644 --- a/sites/redirect.conf +++ b/sites/redirect.conf @@ -1,5 +1,5 @@ server { - listen 80 default_server; - server_name *.tronnet.net; - return 301 https://$host$request_uri; + listen 80 default_server; + server_name *.tronnet.net; + return 301 https://$host$request_uri; } \ No newline at end of file diff --git a/sites/root.conf b/sites/root.conf index 3c2e4ee..affd625 100644 --- a/sites/root.conf +++ b/sites/root.conf @@ -1,10 +1,10 @@ server { - listen 443 ssl http2; - server_name root.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + listen 443 ssl http2; + server_name root.tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; include /etc/nginx/snippets/error-pages.conf; - location / { - proxy_pass http://root.root:80; - include /etc/nginx/snippets/proxy-params.conf; - } + location / { + proxy_pass http://root.root:80; + include /etc/nginx/snippets/proxy-params.conf; + } } diff --git a/sites/status.conf b/sites/status.conf index 12cf870..84b93e8 100644 --- a/sites/status.conf +++ b/sites/status.conf @@ -1,10 +1,10 @@ server { - listen 443 ssl http2; - server_name status.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + listen 443 ssl http2; + server_name status.tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; include /etc/nginx/snippets/error-pages.conf; - location / { - proxy_pass http://sites.dmz:8080; - include /etc/nginx/snippets/proxy-params.conf; - } + location / { + proxy_pass http://sites.dmz:8080; + include /etc/nginx/snippets/proxy-params.conf; + } } diff --git a/sites/wiki.conf b/sites/wiki.conf index 2344b34..4e6cd2e 100644 --- a/sites/wiki.conf +++ b/sites/wiki.conf @@ -1,10 +1,10 @@ server { - listen 443 ssl http2; - server_name wiki.tronnet.net; - include /etc/nginx/snippets/ssl-params.conf; + listen 443 ssl http2; + server_name wiki.tronnet.net; + include /etc/nginx/snippets/ssl-params.conf; include /etc/nginx/snippets/error-pages.conf; - location / { - proxy_pass http://sites.dmz:8081; - include /etc/nginx/snippets/proxy-params.conf; - } + location / { + proxy_pass http://sites.dmz:8081; + include /etc/nginx/snippets/proxy-params.conf; + } } diff --git a/snippets/error-pages.conf b/snippets/error-pages.conf index 3bd0c29..af20e90 100644 --- a/snippets/error-pages.conf +++ b/snippets/error-pages.conf @@ -11,6 +11,6 @@ error_page 502 /ErrorPages/HTTP502.html; error_page 503 /ErrorPages/HTTP503.html; location /ErrorPages/ { - alias /var/www/html/ErrorPages/; - internal; + alias /var/www/html/ErrorPages/; + internal; } diff --git a/snippets/ssl-params.conf b/snippets/ssl-params.conf index 8fa9fbd..0078276 100644 --- a/snippets/ssl-params.conf +++ b/snippets/ssl-params.conf @@ -20,6 +20,6 @@ ssl_certificate_key /etc/letsencrypt/live/tronnet.net/privkey.pem; # letsencrypt validation location '/.well-known/acme-challenge' { - default_type "text/plain"; - root /var/www/html; + default_type "text/plain"; + root /var/www/html; }