diff --git a/nginx/uiogaming.no b/nginx/uiogaming.no index e2b44f4..f492d62 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,16 +84,16 @@ server { } server { - server_name infoskjerm.uiogaming.no; + server_name infoskjerm.uiogaming.no; - # Global config + # Global config include global/global.conf; - location / { - proxy_set_header Host $host; - proxy_pass http://158.36.190.233:8000; - proxy_redirect off; - } + location / { + proxy_set_header Host $host; + proxy_pass http://158.36.190.233:8000; + proxy_redirect off; + } listen 443 ssl; # managed by Certbot @@ -104,34 +104,35 @@ server { } - server { - server_name admin.uiogaming.no; + server_name kuma.uiogaming.no; - # Global config + # Global config include global/global.conf; - return 301 https://uiogaming.sanity.studio; + location / { + proxy_set_header Host $host; + proxy_pass http://127.0.0.1:2121; + proxy_redirect off; + } 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/kuma.uiogaming.no/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/kuma.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; + server_name admin.uiogaming.no; - # Global config + # Global config include global/global.conf; - location / { - alias /var/www/uiogaming.no/vedtekter/; - index vedtekter.pdf; - } + return 301 https://uiogaming.sanity.studio; listen 443 ssl; # managed by Certbot @@ -143,15 +144,35 @@ server { } server { - server_name statutes.uiogaming.no; + server_name vedtekter.uiogaming.no; - # Global config + # Global config include global/global.conf; - location / { - alias /var/www/uiogaming.no/vedtekter/; - index statutes.pdf; - } + 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; + } listen 443 ssl; # managed by Certbot @@ -163,12 +184,12 @@ server { } server { - server_name rules.uiogaming.no; + server_name rules.uiogaming.no; - # Global config + # Global config include global/global.conf; - return 301 https://statutes.uiogaming.no; + return 301 https://statutes.uiogaming.no; listen 443 ssl; # managed by Certbot @@ -180,12 +201,12 @@ server { } server { - server_name laws.uiogaming.no; + server_name laws.uiogaming.no; - # Global config + # Global config include global/global.conf; - return 301 https://statutes.uiogaming.no; + return 301 https://statutes.uiogaming.no; listen 443 ssl; # managed by Certbot @@ -198,12 +219,12 @@ server { server { - server_name innmelding.uiogaming.no; - - # Global config + server_name innmelding.uiogaming.no; + + # Global config include global/global.conf; - return 301 https://forms.gle/njJCkXDcHYmiKYj89; + return 301 https://forms.gle/njJCkXDcHYmiKYj89; listen 443 ssl; # managed by Certbot @@ -215,12 +236,12 @@ server { } server { - server_name join.uiogaming.no; - - # Global config + server_name join.uiogaming.no; + + # Global config include global/global.conf; - return 301 https://innmelding.uiogaming.no; + return 301 https://innmelding.uiogaming.no; listen 443 ssl; # managed by Certbot @@ -232,12 +253,12 @@ server { } server { - server_name klage.uiogaming.no; - - # Global config + server_name klage.uiogaming.no; + + # Global config include global/global.conf; - return 301 https://docs.google.com/forms/d/e/1FAIpQLSfinPnTd993oEMH1Pu52lnP1LRcacGqegOfdP4-hHv1vASn1A/viewform; + return 301 https://docs.google.com/forms/d/e/1FAIpQLSfinPnTd993oEMH1Pu52lnP1LRcacGqegOfdP4-hHv1vASn1A/viewform; @@ -250,12 +271,12 @@ server { } server { - server_name complaint.uiogaming.no; - - # Global config + server_name complaint.uiogaming.no; + + # Global config include global/global.conf; - return 301 https://klage.uiogaming.no; + return 301 https://klage.uiogaming.no; @@ -285,12 +306,12 @@ server { } server { - server_name discord.uiogaming.no; - - # Global config + server_name discord.uiogaming.no; + + # Global config include global/global.conf; - return 301 https://discord.gg/PqsgXbnds4; + return 301 https://discord.gg/PqsgXbnds4; listen 443 ssl; # managed by Certbot @@ -302,12 +323,12 @@ server { } server { - server_name instagram.uiogaming.no; + server_name instagram.uiogaming.no; - # Global config + # Global config include global/global.conf; - return 301 https://instagram.com/uio_gaming; + return 301 https://instagram.com/uio_gaming; listen 443 ssl; # managed by Certbot @@ -337,7 +358,7 @@ server { server { server_name twitch.uiogaming.no; - + # Global config include global/global.conf; @@ -353,12 +374,12 @@ server { } server { - server_name youtube.uiogaming.no; + server_name youtube.uiogaming.no; - # Global config + # Global config include global/global.conf; - return 301 https://www.youtube.com/channel/UCZhUhWT_q0oZGk0rCeov51Q; + return 301 https://www.youtube.com/channel/UCZhUhWT_q0oZGk0rCeov51Q; listen 443 ssl; # managed by Certbot @@ -370,12 +391,12 @@ server { } server { - server_name facebook.uiogaming.no; + server_name facebook.uiogaming.no; - # Global config + # Global config include global/global.conf; - return 301 https://www.facebook.com/UiO-Gaming-113445760510985; + return 301 https://www.facebook.com/UiO-Gaming-113445760510985; listen 443 ssl; # managed by Certbot @@ -387,12 +408,12 @@ server { } server { - server_name tiktok.uiogaming.no; + server_name tiktok.uiogaming.no; - # Global config + # Global config include global/global.conf; - return 301 https://www.tiktok.com/@uio.gaming; + return 301 https://www.tiktok.com/@uio.gaming; listen 443 ssl; # managed by Certbot @@ -404,16 +425,16 @@ server { } server { - server_name mc.uiogaming.no; + server_name mc.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; - } + location / { + proxy_set_header Host $host; + proxy_pass http://127.0.0.1:25565; + proxy_redirect off; + } listen 443 ssl; # managed by Certbot @@ -425,16 +446,16 @@ server { } server { - server_name cs.uiogaming.no; + server_name cs.uiogaming.no; - # Global config + # Global config include global/global.conf; - location / { - proxy_set_header Host $host; - proxy_pass http://127.0.0.1:27015; - proxy_redirect off; - } + location / { + proxy_set_header Host $host; + proxy_pass http://127.0.0.1:27015; + proxy_redirect off; + } listen 443 ssl; # managed by Certbot @@ -447,15 +468,15 @@ server { server { - server_name refusjon.uiogaming.no; - - # Global config - include global/global.conf; - - location / { - alias /var/www/uiogaming.no/refusjon/; - index refusjon.pdf; - } + 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 @@ -477,7 +498,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 @@ -492,7 +513,7 @@ server { } # managed by Certbot - server_name admin.uiogaming.no; + server_name admin.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -505,7 +526,7 @@ server { } # managed by Certbot - server_name api.uiogaming.no; + server_name api.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -518,7 +539,7 @@ server { } # managed by Certbot - server_name bebbes.uiogaming.no; + server_name bebbes.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -531,7 +552,7 @@ server { } # managed by Certbot - server_name dev.uiogaming.no; + server_name dev.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -544,7 +565,7 @@ server { } # managed by Certbot - server_name discord.uiogaming.no; + server_name discord.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -557,7 +578,7 @@ server { } # managed by Certbot - server_name facebook.uiogaming.no; + server_name facebook.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -583,7 +604,7 @@ server { } # managed by Certbot - server_name innmelding.uiogaming.no; + server_name innmelding.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -596,7 +617,7 @@ server { } # managed by Certbot - server_name instagram.uiogaming.no; + server_name instagram.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -627,7 +648,7 @@ server { return 404; # managed by Certbot -} +} server { if ($host = vedtekter.uiogaming.no) { @@ -635,7 +656,7 @@ server { } # managed by Certbot - server_name vedtekter.uiogaming.no; + server_name vedtekter.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -648,7 +669,7 @@ server { } # managed by Certbot - server_name youtube.uiogaming.no; + server_name youtube.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -662,7 +683,7 @@ server { } # managed by Certbot - server_name mc.uiogaming.no; + server_name mc.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -676,7 +697,7 @@ server { } # managed by Certbot - server_name refusjon.uiogaming.no; + server_name refusjon.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -691,7 +712,7 @@ server { } # managed by Certbot - server_name statutes.uiogaming.no; + server_name statutes.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -704,7 +725,7 @@ server { } # managed by Certbot - server_name laws.uiogaming.no; + server_name laws.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -717,7 +738,7 @@ server { } # managed by Certbot - server_name rules.uiogaming.no; + server_name rules.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -731,7 +752,7 @@ server { } # managed by Certbot - server_name complaint.uiogaming.no; + server_name complaint.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -744,7 +765,7 @@ server { } # managed by Certbot - server_name klage.uiogaming.no; + server_name klage.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -759,7 +780,7 @@ server { } # managed by Certbot - server_name join.uiogaming.no; + server_name join.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -773,7 +794,7 @@ server { } # managed by Certbot - server_name cs.uiogaming.no; + server_name cs.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -787,7 +808,7 @@ server { } # managed by Certbot - server_name tiktok.uiogaming.no; + server_name tiktok.uiogaming.no; listen 80; return 404; # managed by Certbot @@ -801,7 +822,21 @@ server { } # managed by Certbot - server_name infoskjerm.uiogaming.no; + server_name infoskjerm.uiogaming.no; + listen 80; + return 404; # managed by Certbot + + +} + + +server { + if ($host = kuma.uiogaming.no) { + return 301 https://$host$request_uri; + } # managed by Certbot + + + server_name kuma.uiogaming.no; listen 80; return 404; # managed by Certbot