Fix redirects

Author: henriquegemignani

default.conf

@@ -9,33 +9,9 @@ server {
     }
     include /etc/nginx/shared/letsencrypt.conf;
 }
-server {
-    listen 80;
-    charset utf-8;
-    server_name forum.uspgamedev.org;
 
-    include /etc/nginx/shared/ssl.conf;
-    location / {
-        return 307 https://forum.usp.game.dev.br$request_uri;
-    }
-    include /etc/nginx/shared/letsencrypt.conf;
-}
 server {
-    listen 80;
     charset utf-8;
-    server_name www.uspgamedev.org uspgamedev.org;
-
-    include /etc/nginx/shared/ssl.conf;
-    location / {
-        return 307 https://usp.game.dev.br$request_uri;
-    }
-    include /etc/nginx/shared/letsencrypt.conf;
-}
-
-server {
-    listen 80 default_server;
-    charset utf-8;
-
     include /etc/nginx/shared/ssl.conf;
 
     location = / {
@@ -96,7 +72,6 @@ server {
 }
 
 server {
-    listen 80;
     charset utf-8;
     server_name blog.usp.game.dev.br blog.uspgamedev.org;
 
@@ -113,7 +88,7 @@ server {
 
 server {
     charset utf-8;
-    server_name forum.usp.game.dev.br forum.uspgamedev.org;
+    server_name forum.usp.game.dev.br;
 
     include /etc/nginx/shared/ssl.conf;
 
@@ -142,3 +117,15 @@ server {
 
     include /etc/nginx/shared/letsencrypt.conf;
 }
+
+server {
+    include /etc/nginx/shared/ssl.conf;
+    server_name forum.uspgamedev.org;
+    return 307 $scheme://forum.usp.game.dev.br$request_uri;
+}
+
+server {
+    include /etc/nginx/shared/ssl.conf;
+    server_name www.uspgamedev.org uspgamedev.org;
+    return 307 $scheme://usp.game.dev.br$request_uri;
+}