diff --git a/sites-available/00 b/sites-available/00 index a66879b..5029361 100644 --- a/sites-available/00 +++ b/sites-available/00 @@ -16,10 +16,9 @@ server { server_name joplin.tradewind.vip; location / { -resolver 223.5.5.5; -set $router "router.tradewind.vip"; + resolver 223.5.5.5; + set $router "router.tradewind.vip"; proxy_set_header Host $host; - proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://$router:8888; diff --git a/sites-available/9song-api b/sites-available/9song-api index 019d41f..2ef299b 100644 --- a/sites-available/9song-api +++ b/sites-available/9song-api @@ -3,7 +3,6 @@ server { location / { proxy_set_header Host $host; -# proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://127.0.0.1:8000/; diff --git a/sites-available/bitwarden b/sites-available/bitwarden index 406bbe0..f735cb6 100644 --- a/sites-available/bitwarden +++ b/sites-available/bitwarden @@ -5,10 +5,10 @@ server { client_max_body_size 128M; location / { -resolver 223.5.5.5; -set $router "router.tradewind.vip"; + resolver 223.5.5.5; + set $router "router.tradewind.vip"; proxy_set_header Host $host; - proxy_redirect off; + proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://$router:10060; diff --git a/sites-available/emby b/sites-available/emby index 9d09552..bff3741 100644 --- a/sites-available/emby +++ b/sites-available/emby @@ -2,14 +2,12 @@ server { server_name emby.tradewind.vip; location / { - add_header Cache-Control no-cache; - add_header Pragma no-cache; - add_header Expires 0; + resolver 223.5.5.5; + set $router "router.tradewind.vip"; proxy_set_header Host $host; -# proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://router.tradewind.vip:8096/; + proxy_pass http://$router:8096; } listen 443 ssl; # managed by Certbot diff --git a/sites-available/gitea b/sites-available/gitea index e3ad201..e402025 100644 --- a/sites-available/gitea +++ b/sites-available/gitea @@ -2,10 +2,9 @@ server { server_name gitea.tradewind.vip; location / { -resolver 223.5.5.5; -set $router "router.tradewind.vip"; + resolver 223.5.5.5; + set $router "router.tradewind.vip"; proxy_set_header Host $host; -# proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://$router:10010; diff --git a/sites-available/joplin b/sites-available/joplin index 564dd04..4dbdf22 100644 --- a/sites-available/joplin +++ b/sites-available/joplin @@ -2,10 +2,10 @@ server { server_name joplin.tradewind.vip; location / { -resolver 223.5.5.5; -set $router "router.tradewind.vip:22300"; + resolver 223.5.5.5; + set $router "router.tradewind.vip:22300"; proxy_set_header Host $host; - proxy_redirect off; + proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://$router; diff --git a/sites-available/leanote b/sites-available/leanote index d9f24db..0c96385 100644 --- a/sites-available/leanote +++ b/sites-available/leanote @@ -2,10 +2,9 @@ server { server_name leanote.tradewind.vip; location / { -resolver 223.5.5.5; -set $router "router.tradewind.vip"; + resolver 223.5.5.5; + set $router "router.tradewind.vip"; proxy_set_header Host $host; -# proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://$router:10000; diff --git a/sites-available/nas b/sites-available/nas index bea9643..62ea056 100644 --- a/sites-available/nas +++ b/sites-available/nas @@ -2,10 +2,10 @@ server { server_name nas.tradewind.vip; location / { -resolver 223.5.5.5; -set $router "router.tradewind.vip"; + resolver 223.5.5.5; + set $router "router.tradewind.vip"; proxy_set_header Host $host; - proxy_redirect off; + proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://$router:5000; diff --git a/sites-available/teamcity b/sites-available/teamcity new file mode 100644 index 0000000..e6f2132 --- /dev/null +++ b/sites-available/teamcity @@ -0,0 +1,32 @@ +server { + server_name teamcity.tradewind.vip; + + location / { + resolver 223.5.5.5; + set $router "router.tradewind.vip"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://$router:8111; + } + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/tradewind.vip/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/tradewind.vip/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 { + if ($host = teamcity.tradewind.vip) { + return 301 https://$host$request_uri; + } # managed by Certbot + + + listen 80; + server_name teamcity.tradewind.vip; + return 404; # managed by Certbot + + +} diff --git a/sites-available/tr b/sites-available/tr index 7f92fed..28ffbd8 100644 --- a/sites-available/tr +++ b/sites-available/tr @@ -2,10 +2,10 @@ server { server_name tr.tradewind.vip; location / { -resolver 223.5.5.5; -set $router "router.tradewind.vip"; + resolver 223.5.5.5; + set $router "router.tradewind.vip"; proxy_set_header Host $host; - proxy_redirect off; + proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_pass http://$router:49091; diff --git a/sites-enabled b/sites-enabled index 7cdfc5b..a6010e3 100644 --- a/sites-enabled +++ b/sites-enabled @@ -4,7 +4,6 @@ api bitwarden emby gitea -gogs img jenkins joplin @@ -12,5 +11,6 @@ leanote nas rss sync +teamcity tr www \ No newline at end of file