diff --git a/nginx/uiogaming.no b/nginx/uiogaming.no index 695bb32..e2b44f4 100644 --- a/nginx/uiogaming.no +++ b/nginx/uiogaming.no @@ -1,14 +1,14 @@ server { - server_name uiogaming.no www.uiogaming.no; + server_name uiogaming.no www.uiogaming.no; - # Global config + # Global config include global/global.conf; - location / { - proxy_set_header Host $host; - proxy_pass http://127.0.0.1:9000; - proxy_redirect off; - } + location / { + proxy_set_header Host $host; + proxy_pass http://127.0.0.1:9000; + proxy_redirect off; + } listen 443 ssl; # managed by Certbot @@ -21,16 +21,16 @@ server { } server { - server_name dev.uiogaming.no; - - # Global config + server_name dev.uiogaming.no; + + # Global config include global/global.conf; - - location / { - proxy_set_header Host $host; - proxy_pass http://46.212.148.174:9000; - proxy_redirect off; - } + + location / { + proxy_set_header Host $host; + proxy_pass http://46.212.148.174:9000; + proxy_redirect off; + } listen 443 ssl; # managed by Certbot @@ -42,16 +42,16 @@ server { } server { - server_name api.uiogaming.no; + server_name api.uiogaming.no; - # Global config + # Global config include global/global.conf; - location / { - proxy_set_header Host $host; - proxy_pass http://127.0.0.1:9001; - proxy_redirect off; - } + location / { + proxy_set_header Host $host; + proxy_pass http://127.0.0.1:9001; + proxy_redirect off; + } listen 443 ssl; # managed by Certbot @@ -63,16 +63,16 @@ server { } server { - server_name bebbes.uiogaming.no; + server_name bebbes.uiogaming.no; - # Global config + # Global config include global/global.conf; - location / { - proxy_set_header Host $host; - proxy_pass http://127.0.0.1:5001; - proxy_redirect off; - } + location / { + proxy_set_header Host $host; + proxy_pass http://127.0.0.1:5001; + proxy_redirect off; + } listen 443 ssl; # managed by Certbot @@ -84,12 +84,54 @@ server { } server { - server_name admin.uiogaming.no; + server_name infoskjerm.uiogaming.no; - # Global config + # Global config include global/global.conf; - rewrite ^/(.*)$ https://uiogaming.sanity.studio; + location / { + proxy_set_header Host $host; + proxy_pass http://158.36.190.233:8000; + proxy_redirect off; + } + + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/infoskjerm.uiogaming.no/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/infoskjerm.uiogaming.no/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot + +} + + +server { + server_name admin.uiogaming.no; + + # Global config + include global/global.conf; + + return 301 https://uiogaming.sanity.studio; + + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/uiogaming.no/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/uiogaming.no/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot + +} + +server { + server_name vedtekter.uiogaming.no; + + # Global config + include global/global.conf; + + location / { + alias /var/www/uiogaming.no/vedtekter/; + index vedtekter.pdf; + } listen 443 ssl; # managed by Certbot @@ -101,35 +143,15 @@ server { } server { - server_name vedtekter.uiogaming.no; + server_name statutes.uiogaming.no; - # Global config + # Global config include global/global.conf; - location / { - alias /var/www/uiogaming.no/vedtekter/; - index vedtekter.pdf; - } - - - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/uiogaming.no/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/uiogaming.no/privkey.pem; # managed by Certbot - include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot - ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - -} - -server { - server_name statutes.uiogaming.no; - - # Global config - include global/global.conf; - - location / { - alias /var/www/uiogaming.no/vedtekter/; - index statutes.pdf; - } + location / { + alias /var/www/uiogaming.no/vedtekter/; + index statutes.pdf; + } listen 443 ssl; # managed by Certbot @@ -141,12 +163,12 @@ server { } server { - server_name rules.uiogaming.no; + server_name rules.uiogaming.no; - # Global config + # Global config include global/global.conf; - rewrite ^(.*)$ https://statutes.uiogaming.no; + return 301 https://statutes.uiogaming.no; listen 443 ssl; # managed by Certbot @@ -158,12 +180,12 @@ server { } server { - server_name laws.uiogaming.no; + server_name laws.uiogaming.no; - # Global config + # Global config include global/global.conf; - rewrite ^(.*)$ https://statutes.uiogaming.no; + return 301 https://statutes.uiogaming.no; listen 443 ssl; # managed by Certbot @@ -176,12 +198,12 @@ server { server { - server_name innmelding.uiogaming.no; - - # Global config + server_name innmelding.uiogaming.no; + + # Global config include global/global.conf; - rewrite ^/(.*)$ https://forms.gle/njJCkXDcHYmiKYj89; + return 301 https://forms.gle/njJCkXDcHYmiKYj89; listen 443 ssl; # managed by Certbot @@ -193,30 +215,29 @@ server { } server { - server_name join.uiogaming.no; - - # Global config + server_name join.uiogaming.no; + + # Global config include global/global.conf; - rewrite ^/(.*)$ https://forms.gle/njJCkXDcHYmiKYj89; + return 301 https://innmelding.uiogaming.no; listen 443 ssl; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/uiogaming.no/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/uiogaming.no/privkey.pem; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/join.uiogaming.no/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/join.uiogaming.no/privkey.pem; # managed by Certbot include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot - } server { - server_name klage.uiogaming.no; - - # Global config + server_name klage.uiogaming.no; + + # Global config include global/global.conf; - rewrite ^/(.*)$ https://docs.google.com/forms/d/e/1FAIpQLSfinPnTd993oEMH1Pu52lnP1LRcacGqegOfdP4-hHv1vASn1A/viewform; + return 301 https://docs.google.com/forms/d/e/1FAIpQLSfinPnTd993oEMH1Pu52lnP1LRcacGqegOfdP4-hHv1vASn1A/viewform; @@ -229,12 +250,12 @@ server { } server { - server_name complaint.uiogaming.no; - - # Global config + server_name complaint.uiogaming.no; + + # Global config include global/global.conf; - rewrite ^/(.*)$ https://docs.google.com/forms/d/e/1FAIpQLSfinPnTd993oEMH1Pu52lnP1LRcacGqegOfdP4-hHv1vASn1A/viewform; + return 301 https://klage.uiogaming.no; @@ -252,7 +273,7 @@ server { # Global config include global/global.conf; - rewrite ^/(.*)$ https://buy.stripe.com/14kdSp0UpbETgJqaEE; + return 301 https://buy.stripe.com/14kdSp0UpbETgJqaEE; listen 443 ssl; # managed by Certbot @@ -264,12 +285,12 @@ server { } server { - server_name discord.uiogaming.no; - - # Global config + server_name discord.uiogaming.no; + + # Global config include global/global.conf; - rewrite ^/(.*)$ https://discord.gg/PqsgXbnds4; + return 301 https://discord.gg/PqsgXbnds4; listen 443 ssl; # managed by Certbot @@ -281,12 +302,12 @@ server { } server { - server_name instagram.uiogaming.no; + server_name instagram.uiogaming.no; - # Global config + # Global config include global/global.conf; - rewrite ^/(.*)$ https://instagram.com/uio_gaming; + return 301 https://instagram.com/uio_gaming; listen 443 ssl; # managed by Certbot @@ -303,7 +324,7 @@ server { # Global config include global/global.conf; - rewrite ^/(.*)$ https://github.com/UiO-Gaming; + return 301 https://github.com/UiO-Gaming; listen 443 ssl; # managed by Certbot @@ -316,11 +337,11 @@ server { server { server_name twitch.uiogaming.no; - + # Global config include global/global.conf; - rewrite ^/(.*)$ https://twitch.tv/uio_gaming; + return 301 https://twitch.tv/uio_gaming; listen 443 ssl; # managed by Certbot @@ -332,12 +353,12 @@ server { } server { - server_name youtube.uiogaming.no; + server_name youtube.uiogaming.no; - # Global config + # Global config include global/global.conf; - rewrite ^/(.*)$ https://www.youtube.com/channel/UCZhUhWT_q0oZGk0rCeov51Q; + return 301 https://www.youtube.com/channel/UCZhUhWT_q0oZGk0rCeov51Q; listen 443 ssl; # managed by Certbot @@ -349,12 +370,12 @@ server { } server { - server_name facebook.uiogaming.no; + server_name facebook.uiogaming.no; - # Global config + # Global config include global/global.conf; - rewrite ^/(.*)$ https://www.facebook.com/UiO-Gaming-113445760510985; + return 301 https://www.facebook.com/UiO-Gaming-113445760510985; listen 443 ssl; # managed by Certbot @@ -366,16 +387,33 @@ server { } server { - server_name mc.uiogaming.no; + server_name tiktok.uiogaming.no; - # Global config + # Global config include global/global.conf; - location / { - proxy_set_header Host $host; - proxy_pass http://127.0.0.1:25565; - proxy_redirect off; - } + return 301 https://www.tiktok.com/@uio.gaming; + + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/tiktok.uiogaming.no/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/tiktok.uiogaming.no/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot + +} + +server { + server_name mc.uiogaming.no; + + # Global config + include global/global.conf; + + location / { + proxy_set_header Host $host; + proxy_pass http://127.0.0.1:25565; + proxy_redirect off; + } listen 443 ssl; # managed by Certbot @@ -387,15 +425,37 @@ server { } server { - server_name refusjon.uiogaming.no; + server_name cs.uiogaming.no; - # Global config + # Global config include global/global.conf; - location / { - alias /var/www/uiogaming.no/refusjon/; - index refusjon.pdf; - } + location / { + proxy_set_header Host $host; + proxy_pass http://127.0.0.1:27015; + proxy_redirect off; + } + + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/cs.uiogaming.no/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/cs.uiogaming.no/privkey.pem; # managed by Certbot + include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot + ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot + +} + + +server { + server_name refusjon.uiogaming.no; + + # Global config + include global/global.conf; + + location / { + alias /var/www/uiogaming.no/refusjon/; + index refusjon.pdf; + } listen 443 ssl; # managed by Certbot @@ -417,7 +477,7 @@ server { } # managed by Certbot - server_name uiogaming.no www.uiogaming.no; + server_name uiogaming.no www.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -432,7 +492,7 @@ server { } # managed by Certbot - server_name admin.uiogaming.no; + server_name admin.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -445,7 +505,7 @@ server { } # managed by Certbot - server_name api.uiogaming.no; + server_name api.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -458,7 +518,7 @@ server { } # managed by Certbot - server_name bebbes.uiogaming.no; + server_name bebbes.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -471,7 +531,7 @@ server { } # managed by Certbot - server_name dev.uiogaming.no; + server_name dev.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -484,7 +544,7 @@ server { } # managed by Certbot - server_name discord.uiogaming.no; + server_name discord.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -497,7 +557,7 @@ server { } # managed by Certbot - server_name facebook.uiogaming.no; + server_name facebook.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -523,7 +583,7 @@ server { } # managed by Certbot - server_name innmelding.uiogaming.no; + server_name innmelding.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -536,7 +596,7 @@ server { } # managed by Certbot - server_name instagram.uiogaming.no; + server_name instagram.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -567,7 +627,7 @@ server { return 404; # managed by Certbot -} +} server { if ($host = vedtekter.uiogaming.no) { @@ -575,7 +635,7 @@ server { } # managed by Certbot - server_name vedtekter.uiogaming.no; + server_name vedtekter.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -588,7 +648,7 @@ server { } # managed by Certbot - server_name youtube.uiogaming.no; + server_name youtube.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -602,7 +662,7 @@ server { } # managed by Certbot - server_name mc.uiogaming.no; + server_name mc.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -616,7 +676,7 @@ server { } # managed by Certbot - server_name refusjon.uiogaming.no; + server_name refusjon.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -631,7 +691,7 @@ server { } # managed by Certbot - server_name statutes.uiogaming.no; + server_name statutes.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -644,7 +704,7 @@ server { } # managed by Certbot - server_name laws.uiogaming.no; + server_name laws.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -657,7 +717,7 @@ server { } # managed by Certbot - server_name rules.uiogaming.no; + server_name rules.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -671,7 +731,7 @@ server { } # managed by Certbot - server_name complaint.uiogaming.no; + server_name complaint.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -684,20 +744,64 @@ server { } # managed by Certbot - server_name klage.uiogaming.no; + server_name klage.uiogaming.no; listen 80; return 404; # managed by Certbot } + + server { if ($host = join.uiogaming.no) { return 301 https://$host$request_uri; } # managed by Certbot - server_name join.uiogaming.no; + server_name join.uiogaming.no; + listen 80; + return 404; # managed by Certbot + + +} + + +server { + if ($host = cs.uiogaming.no) { + return 301 https://$host$request_uri; + } # managed by Certbot + + + server_name cs.uiogaming.no; + listen 80; + return 404; # managed by Certbot + + +} + + +server { + if ($host = tiktok.uiogaming.no) { + return 301 https://$host$request_uri; + } # managed by Certbot + + + server_name tiktok.uiogaming.no; + listen 80; + return 404; # managed by Certbot + + +} + + +server { + if ($host = infoskjerm.uiogaming.no) { + return 301 https://$host$request_uri; + } # managed by Certbot + + + server_name infoskjerm.uiogaming.no; listen 80; return 404; # managed by Certbot