diff --git a/common/littlelink.conf b/common/littlelink.conf index 2db421f..47bd263 100644 --- a/common/littlelink.conf +++ b/common/littlelink.conf @@ -29,4 +29,4 @@ location ~ \.sqlite$ { deny all; } location ~ \.env$ { deny all; } location ~ /\.htaccess { allow all; } - + diff --git a/common/pgp.conf b/common/pgp.conf new file mode 100644 index 0000000..588b3ae --- /dev/null +++ b/common/pgp.conf @@ -0,0 +1,4 @@ +add_header Onion-Location http://pgp.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; +add_header X-I2P-Location http://vernqfnkg7oybcbrr6roinm64wkd6goetv4funbqjgtddmsexo7q.b32.i2p$request_uri; +root /var/www/pgp; +index index.html index.htm; diff --git a/common/ruraldict.conf b/common/ruraldict.conf new file mode 100644 index 0000000..27fb8cb --- /dev/null +++ b/common/ruraldict.conf @@ -0,0 +1,10 @@ +add_header Onion-Location http://rd.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; +add_header X-I2P-Location http://vern5cxiaufqvhv4hu5ypkvw3tiwvuinae4evdbqzrioql6s2sha.b32.i2p$request_uri; + +location / { + proxy_pass http://10.0.3.57:2944/; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; +} diff --git a/common/searxng.conf b/common/searxng.conf index 19737cf..ee2678d 100644 --- a/common/searxng.conf +++ b/common/searxng.conf @@ -2,18 +2,18 @@ add_header Onion-Location http://sx.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajh add_header X-I2P-Location http://vernvtyi6rdcmv646in4qb4qkbtdi32f4m7zbkcoyualz7bzsfrq.b32.i2p$request_uri; location / { - uwsgi_pass 192.168.122.53:5003; + uwsgi_pass 192.168.122.53:5003; - include snippets/uwsgi_params; + include snippets/uwsgi_params; - uwsgi_param HTTP_HOST $host; - uwsgi_param HTTP_CONNECTION $http_connection; + uwsgi_param HTTP_HOST $host; + uwsgi_param HTTP_CONNECTION $http_connection; - # see flaskfix.py - uwsgi_param HTTP_X_SCHEME $scheme; - uwsgi_param HTTP_X_SCRIPT_NAME /searxng; + # see flaskfix.py + uwsgi_param HTTP_X_SCHEME $scheme; + uwsgi_param HTTP_X_SCRIPT_NAME /searxng; - # see limiter.py - uwsgi_param HTTP_X_REAL_IP $remote_addr; - uwsgi_param HTTP_X_FORWARDED_FOR $proxy_add_x_forwarded_for; + # see limiter.py + uwsgi_param HTTP_X_REAL_IP $remote_addr; + uwsgi_param HTTP_X_FORWARDED_FOR $proxy_add_x_forwarded_for; } diff --git a/common/usersites.conf b/common/usersites.conf index 89e8946..041ea3c 100644 --- a/common/usersites.conf +++ b/common/usersites.conf @@ -5,9 +5,9 @@ error_log /var/log/nginx/vern.cc-error.log info; root /sshfs/home/$user/public_html; index index.html index.php index.cgi index.py index.sh index.pl index.lua; ssi on; - + location @extensionless-php { - rewrite ^(.*)$ $1.php last; + rewrite ^(.*)$ $1.php last; } location ~ \.php$ { fastcgi_pass 192.168.122.30:9000; diff --git a/common/website.conf b/common/website.conf index cb23b3e..a180a7b 100644 --- a/common/website.conf +++ b/common/website.conf @@ -85,8 +85,8 @@ location /sitemap { error_page 503 /en/errors/503; } location /status { - vhost_traffic_status_display; - vhost_traffic_status_display_format html; + vhost_traffic_status_display; + vhost_traffic_status_display_format html; auth_basic "Administrator Login"; auth_basic_user_file /var/www/htpasswd; } diff --git a/common/woodpeckerci.conf b/common/woodpeckerci.conf index 6800c04..17eb822 100644 --- a/common/woodpeckerci.conf +++ b/common/woodpeckerci.conf @@ -2,12 +2,12 @@ add_header Onion-Location http://ci.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajh add_header X-I2P-Location http://vernp46vgdvbfjlxibqbmlk2wxckgjvnoj5ixjdkdr2n773mra4a.b32.i2p$request_uri; location / { - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $http_host; - proxy_pass http://192.168.122.30:8000; - proxy_redirect off; - proxy_http_version 1.1; - proxy_buffering off; - chunked_transfer_encoding off; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header Host $http_host; + proxy_pass http://192.168.122.30:8000; + proxy_redirect off; + proxy_http_version 1.1; + proxy_buffering off; + chunked_transfer_encoding off; } diff --git a/conf.d/pgp.conf b/conf.d/pgp.conf new file mode 100644 index 0000000..e885629 --- /dev/null +++ b/conf.d/pgp.conf @@ -0,0 +1,32 @@ +server { + listen 80; + listen [::]:80; + + server_name pgp.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion; + + include common/pgp.conf; +} + +server { + listen 11099; + listen [::]:11099; + + server_name vernqfnkg7oybcbrr6roinm64wkd6goetv4funbqjgtddmsexo7q.b32.i2p; + + include common/pgp.conf; +} + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name pgp.vern.cc; + include common/pgp.conf; + include snippets/lets-encrypt.conf; +} + +server { + listen 80; + listen [::]:80; + return 301 https://$host$request_uri; + server_name pgp.vern.cc; +} diff --git a/conf.d/ruraldict.conf b/conf.d/ruraldict.conf new file mode 100644 index 0000000..1947e5c --- /dev/null +++ b/conf.d/ruraldict.conf @@ -0,0 +1,32 @@ +server { + listen 80; + listen [::]:80; + + server_name rd.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion rural.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion urban.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion; + + include common/ruraldict.conf; +} + +server { + listen 11098; + listen [::]:11098; + + server_name vern5cxiaufqvhv4hu5ypkvw3tiwvuinae4evdbqzrioql6s2sha.b32.i2p; + + include common/ruraldict.conf; +} + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + include snippets/lets-encrypt.conf; + server_name rd.vern.cc rural.vern.cc urban.vern.cc; + include common/ruraldict.conf; +} + +server { + listen 80; + listen [::]:80; + return 301 https://$host$request_uri; + server_name rd.vern.cc rural.vern.cc urban.vern.cc; +}