From: nutra-bot Date: Tue, 28 Jun 2022 00:47:27 +0000 (+0000) Subject: format X-Git-Url: https://git.nutra.tk/v1?a=commitdiff_plain;h=050b4321709b95f68c9e07fa767d2a71db2ccc78;p=nutratech%2Fvps-root.git format --- diff --git a/.editorconfig b/.editorconfig index d9f1e38..e5713db 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,6 +10,10 @@ trim_trailing_whitespace = true max_line_length = 100 +[default] +indent_size = 2 + + [{nutra,*.py}] max_line_length = 88 diff --git a/etc/nginx/sites-available/default b/etc/nginx/sites-available/default index 8a75293..8648c45 100644 --- a/etc/nginx/sites-available/default +++ b/etc/nginx/sites-available/default @@ -8,11 +8,16 @@ server { server_name deveast.linode.poczatek.dev; # listen 443 ssl http2 default_server; listen [::]:443 ssl http2 default_server; + + + # TODO: do we want to do this? # Serve static files if found, otherwise proxy to Sanic location / { root /var/www; try_files $uri @sanic; } + + location @sanic { proxy_pass http://$server_name; # Allow fast streaming HTTP/1.1 pipes (keep-alive, unbuffered) @@ -25,33 +30,33 @@ server { proxy_set_header connection "upgrade"; proxy_set_header upgrade $http_upgrade; } + + # default favicon location = /favicon.ico { alias /www/ntserv/static/favicon.gif; } - listen 443 ssl; # managed by Certbot - ssl_certificate /etc/letsencrypt/live/deveast.linode.poczatek.dev/fullchain.pem; # managed by Certbot - ssl_certificate_key /etc/letsencrypt/live/deveast.linode.poczatek.dev/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 - + listen 443 ssl; # managed by Certbot + ssl_certificate /etc/letsencrypt/live/deveast.linode.poczatek.dev/fullchain.pem; # managed by Certbot + ssl_certificate_key /etc/letsencrypt/live/deveast.linode.poczatek.dev/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 } - +# TODO: if is evil +# https://wordpress.org/support/article/nginx/ +# http://wiki.nginx.org/IfIsEvil server { if ($host = deveast.linode.poczatek.dev) { return 301 https://$host$request_uri; } # managed by Certbot - server_name deveast.linode.poczatek.dev; - listen 80; - return 404; # managed by Certbot - - + listen 80; + return 404; # managed by Certbot } @@ -63,6 +68,7 @@ server { return 301 https://$1$request_uri; } + # Redirect WWW to no-WWW server { listen 443 ssl http2;