diff --git a/services/ingress/blog.conf b/services/ingress/blog.conf deleted file mode 100644 index 8bd2d41..0000000 --- a/services/ingress/blog.conf +++ /dev/null @@ -1,43 +0,0 @@ -server { - server_name blog.maksim-pankov.ru; - - location / { - proxy_pass http://localhost:9988; - proxy_set_header Host $http_host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_buffer_size 8k; - } - - # location /styles/ { - # try_files $uri $uri/ $uri.html =404; - # root /opt/blog_content/; - # } - large_client_header_buffers 4 32k; - - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/blog.maksim-pankov.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/blog.maksim-pankov.ru/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 { - listen 192.168.0.101:7788; - location / { - root /opt/blog_content/; - try_files $uri $uri/ $uri.html =404; - } -} - -server { - if ($host = blog.maksim-pankov.ru) { - return 301 https://$host$request_uri; - } # managed by Certbot - - - server_name blog.maksim-pankov.ru; - listen 80; - return 404; # managed by Certbot -} diff --git a/services/ingress/gitea.nginx.conf b/services/ingress/gitea.nginx.conf index 9be3c38..eaaae0b 100644 --- a/services/ingress/gitea.nginx.conf +++ b/services/ingress/gitea.nginx.conf @@ -25,4 +25,4 @@ server { return 404; # managed by Certbot -} \ No newline at end of file +} diff --git a/services/ingress/nextcloud.conf b/services/ingress/nextcloud.conf index 9c70019..29dc77a 100644 --- a/services/ingress/nextcloud.conf +++ b/services/ingress/nextcloud.conf @@ -1,28 +1,28 @@ server { - listen 443 ssl; # managed by Certbot - server_name maksim-pankov.ru skazochnik.spb.ru gipat; + server_name cloud.maksim-pankov.ru; location / { proxy_pass http://gipat:5002/; - sub_filter "http://gipat:5002/" "https://skazochnik.spb.ru/"; + sub_filter "http://gipat:5002/" "https://cloud.maksim-pankov.ru/"; client_max_body_size 0; } - ssl_certificate /etc/letsencrypt/live/maksim-pankov.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/maksim-pankov.ru/privkey.pem; # managed by Certbot + + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/cloud.maksim-pankov.ru/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/cloud.maksim-pankov.ru/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 { - listen 8989 ssl default_server; # managed by Certbot - server_name maksim-pankov.ru skazochnik.spb.ru gipat; - location / { - root /var/www/website_frontend; - index index.html index.htm; - } + if ($host = cloud.maksim-pankov.ru) { + return 301 https://$host$request_uri; + } # managed by Certbot - ssl_certificate /etc/letsencrypt/live/skazochnik.spb.ru/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/skazochnik.spb.ru/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_name cloud.maksim-pankov.ru; + listen 80; + return 404; # managed by Certbot + + +} \ No newline at end of file diff --git a/services/ingress/site.conf b/services/ingress/site.conf new file mode 100644 index 0000000..37e5da5 --- /dev/null +++ b/services/ingress/site.conf @@ -0,0 +1,35 @@ +server { + server_name maksim-pankov.ru; + root /opt/site/_site; + + location / { + try_files $uri $uri/ =404; + } + + location /data/ { + alias /mnt/Teka2/site-data/; + } + + large_client_header_buffers 4 32k; + + + + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/maksim-pankov.ru/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/maksim-pankov.ru/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 = maksim-pankov.ru) { + return 301 https://$host$request_uri; + } # managed by Certbot + + + server_name maksim-pankov.ru; + listen 80; + return 404; # managed by Certbot + + +} \ No newline at end of file