rename files with conf type,

cleanup other config files

Signed-off-by: Arthur Lu <learthurgo@gmail.com>

nginx.conf

@@ -1,59 +1,27 @@
 user www-data;
 worker_processes auto;
 pid /run/nginx.pid;
-# include /etc/nginx/modules/*.conf;
-
 events {
 	worker_connections 768;
-	# multi_accept on;
 }
 http {
-	##
-	# Basic Settings
-	##
-
 	sendfile on;
 	tcp_nopush on;
 	types_hash_max_size 2048;
-	# server_tokens off;
-
-	# server_names_hash_bucket_size 64;
-	# server_name_in_redirect off;
 
 	include /etc/nginx/mime.types;
 	default_type application/octet-stream;
 
-	##
-	# SSL Settings
-	##
-
-	# ssl_protocols TLSv1 TLSv1.1 TLSv1.2 TLSv1.3; # Dropping SSLv3, ref: POODLE
-	# ssl_prefer_server_ciphers on;
-
-	##
-	# Logging Settings
-	##
-
 	access_log /var/log/nginx/access.log;
 	error_log /var/log/nginx/error.log;
 
-	##
-	# Gzip Settings
-	##
-
 	gzip on;
+	gzip_vary on;
+	gzip_proxied any;
+	gzip_comp_level 6;
+	gzip_buffers 16 8k;
+	gzip_http_version 1.1;
+	gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
-	# gzip_vary on;
-	# gzip_proxied any;
-	# gzip_comp_level 6;
-	# gzip_buffers 16 8k;
-	# gzip_http_version 1.1;
-	# gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
-
-	##
-	# Virtual Host Configs
-	##
-
-	# include /etc/nginx/conf.d/*.conf;
 	include /etc/nginx/sites/*;
 }

sites/client.conf

@@ -1,8 +1,3 @@
-server {
-    listen 80;
-    server_name client.tronnet.net;
-    rewrite ^(.*) https://$host$1 permanent;
-}
 server {
     listen 443 ssl http2;
     server_name client.tronnet.net;

sites/default.conf

@@ -1,8 +1,3 @@
-server {
-    listen 80 default_server;
-    server_name *.tronnet.net;
-    return 301 https://tronnet.net;
-}
 server {
     listen 443 ssl http2 default_server;
     server_name *.tronnet.net;

sites/homepage.conf

@@ -1,8 +1,3 @@
-server {
-    listen 80;
-    server_name tronnet.net;
-    rewrite ^(.*) https://$host$1 permanent;
-} 
 server {
     listen 443 ssl http2;
     server_name tronnet.net;

sites/ldap.conf

@@ -1,8 +1,3 @@
-server {
-    listen 80;
-    server_name ldap.tronnet.net;
-    rewrite ^(.*) https://$host$1 permanent;
-}
 server {
     listen 443 ssl http2;
     server_name ldap.tronnet.net;

sites/mail.conf

@@ -1,9 +1,3 @@
-server {
-    listen 80;
-    server_name mail.tronnet.net;
-    rewrite ^(.*) https://$host$1 permanent;
-}
- 
 server {
     listen 443 ssl http2;
     server_name mail.tronnet.net;

sites/nextcloud.conf

@@ -1,8 +1,3 @@
-server {
-    listen 80;
-    server_name nextcloud.tronnet.net;
-    rewrite ^(.*) https://$host$1 permanent;
-} 
 server {
     listen 443 ssl http2;
     server_name nextcloud.tronnet.net;

sites/opns.conf

@@ -1,9 +1,3 @@
-server {
-    listen 80;
-    server_name opns.tronnet.net;
-    rewrite ^(.*) https://$host$1 permanent;
-}
- 
 server {
     listen 443 ssl http2;
     server_name opns.tronnet.net;

sites/pve.conf

@@ -1,9 +1,3 @@
-server {
-    listen 80;
-    server_name pve.tronnet.net;
-    rewrite ^(.*) https://$host$1 permanent;
-}
- 
 server {
     listen 443 ssl http2;
     server_name pve.tronnet.net;

sites/redirect.conf

@@ -0,0 +1,5 @@
+server {
+    listen 80 default_server;
+    server_name *.tronnet.net;
+    return 301 https://$host$request_uri;
+}

sites/root.conf

@@ -1,9 +1,3 @@
-server {
-    listen 80;
-    server_name root.tronnet.net;
-    rewrite ^(.*) https://$host$1 permanent;
-}
- 
 server {
     listen 443 ssl http2;
     server_name root.tronnet.net;

sites/status.conf

@@ -1,8 +1,3 @@
-server {
-    listen 80;
-    server_name status.tronnet.net;
-    rewrite ^(.*) https://$host$1 permanent;
-}
 server {
     listen 443 ssl http2;
     server_name status.tronnet.net;

sites/wiki.conf

@@ -1,8 +1,3 @@
-server {
-    listen 80;
-    server_name wiki.tronnet.net;
-    rewrite ^(.*) https://$host$1 permanent;
-}
 server {
     listen 443 ssl http2;
     server_name wiki.tronnet.net;

snippets/ssl-params.conf

@@ -9,7 +9,6 @@ ssl_stapling on;
 ssl_stapling_verify on;
 resolver 8.8.8.8 8.8.4.4 valid=300s;
 resolver_timeout 5s;
-# add_header Strict-Transport-Security "max-age=31536000; includeSubdomains" always;
 add_header X-Frame-Options SAMEORIGIN;
 add_header X-Content-Type-Options nosniff;
 add_header X-XSS-Protection "1; mode=block";