diff --git a/nginx/sites-available-archive/i.zzls.xyz.conf b/nginx/sites-available-archive/i.zzls.xyz.conf new file mode 100644 index 0000000..caaa252 --- /dev/null +++ b/nginx/sites-available-archive/i.zzls.xyz.conf @@ -0,0 +1,38 @@ +server { + + access_log /var/log/nginx/i.access.log combined; + + #root /mnt/blockstorage/i/files/; + index index.html index.htm index.nginx-debian.html; + + server_name i.zzls.xyz; + include configs/general.conf; + include configs/securityheaders.conf; + + location / { + client_max_body_size 51M; + proxy_pass http://127.0.0.1:40007/; + include configs/proxyheaders.conf; + proxy_intercept_errors on; + error_page 404 = /error; + } + + listen 443 ssl http2; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/i.zzls.xyz/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/i.zzls.xyz/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 = i.zzls.xyz) { + return 301 https://$host$request_uri; + } # managed by Certbot + + + server_name i.zzls.xyz; + listen 80; + return 404; # managed by Certbot + + + } diff --git a/nginx/sites-available/files.zzls.xyz.conf b/nginx/sites-available/files.zzls.xyz.conf index 29a7bca..5e0062e 100755 --- a/nginx/sites-available/files.zzls.xyz.conf +++ b/nginx/sites-available/files.zzls.xyz.conf @@ -16,7 +16,7 @@ server { return 404; } - root /mnt/blockstorage/wwwfiles; + root /mnt/blockstorage/files.zzls.xyz; index index.html index.php /_h5ai/public/index.php; dav_ext_methods PROPFIND OPTIONS; diff --git a/nginx/sites-available/i.zzls.xyz.conf b/nginx/sites-available/i.zzls.xyz.conf index 95ff7e4..94574b0 100755 --- a/nginx/sites-available/i.zzls.xyz.conf +++ b/nginx/sites-available/i.zzls.xyz.conf @@ -1,8 +1,5 @@ server { - access_log /var/log/nginx/i.access.log combined; - - #root /mnt/blockstorage/i/files/; index index.html index.htm index.nginx-debian.html; server_name i.zzls.xyz; @@ -10,15 +7,7 @@ server { include configs/securityheaders.conf; location / { - client_max_body_size 51M; - proxy_pass http://127.0.0.1:40007/; - include configs/proxyheaders.conf; - proxy_intercept_errors on; - error_page 404 = /error; - } - - location ^/error* { - root /var/www/html; + rewrite ^/(.*)$ https://ayaya.beauty/$1 redirect; } #location /upload { @@ -44,6 +33,4 @@ server { server_name i.zzls.xyz; listen 80; return 404; # managed by Certbot - - } diff --git a/nginx/sites-available/logs.zzls.xyz.conf b/nginx/sites-available/logs.zzls.xyz.conf index 4132756..ec8afa3 100755 --- a/nginx/sites-available/logs.zzls.xyz.conf +++ b/nginx/sites-available/logs.zzls.xyz.conf @@ -1,5 +1,4 @@ server { - access_log /var/log/nginx/logs.access.log combined; server_name logs.zzls.xyz; @@ -26,7 +25,6 @@ server { error_page 501 502 503 /50x.html; proxy_intercept_errors on; - } location = /50x.html {