From c78f0ac93b2d62916495442ba86fafc04f4b1f2b Mon Sep 17 00:00:00 2001 From: root Date: Wed, 21 Dec 2022 11:20:28 +0000 Subject: [PATCH] php8.1 --- common/dokuwiki.conf | 2 +- common/freshrss.conf | 2 +- common/fulltextrss.conf | 2 +- common/hat.conf | 1 - common/hyperpipe-proxy.conf | 13 +++++++++++++ common/librex.conf | 2 +- common/littlelink.conf | 2 +- common/nextcloud.conf | 2 +- common/privatebin.conf | 2 +- common/quetre.conf | 3 +-- common/roundcube.conf | 2 +- common/rssbridge.conf | 2 +- common/website.conf | 3 ++- common/whoogle.conf | 2 +- conf.d/00website.conf | 12 ++++++++---- conf.d/nextcloud.conf | 2 +- conf.d/quetre.conf | 1 - 17 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 common/hyperpipe-proxy.conf diff --git a/common/dokuwiki.conf b/common/dokuwiki.conf index 55e805b..40efab5 100644 --- a/common/dokuwiki.conf +++ b/common/dokuwiki.conf @@ -9,7 +9,7 @@ location / { } location ~ \.php$ { - fastcgi_pass unix:/run/php/php8.0-fpm.sock; + fastcgi_pass unix:/run/php/php8.1-fpm.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include /etc/nginx/snippets/fastcgi.conf; diff --git a/common/freshrss.conf b/common/freshrss.conf index 9aaf76c..ce48fba 100644 --- a/common/freshrss.conf +++ b/common/freshrss.conf @@ -9,7 +9,7 @@ error_log /var/log/nginx/rss.error.log; # php files handling # this regex is mandatory because of the API location ~ ^.+?\.php(/.*)?$ { - fastcgi_pass unix:/var/run/php/php8.0-fpm.sock; + fastcgi_pass unix:/var/run/php/php8.1-fpm.sock; fastcgi_split_path_info ^(.+\.php)(/.*)$; # By default, the variable PATH_INFO is not set under PHP-FPM # But FreshRSS API greader.php need it. If you have a “Bad Request” error, double check this var! diff --git a/common/fulltextrss.conf b/common/fulltextrss.conf index 1794f82..2244faf 100644 --- a/common/fulltextrss.conf +++ b/common/fulltextrss.conf @@ -9,7 +9,7 @@ location / { } location ~ \.php$ { - fastcgi_pass unix:/run/php/php8.0-fpm.sock; + fastcgi_pass unix:/run/php/php8.1-fpm.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include /etc/nginx/snippets/fastcgi.conf; diff --git a/common/hat.conf b/common/hat.conf index 3e66207..816dbf8 100644 --- a/common/hat.conf +++ b/common/hat.conf @@ -7,6 +7,5 @@ location / { proxy_set_header Host $host; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header X-Forwarded-Proto $scheme; - proxy_cache mycache; } diff --git a/common/hyperpipe-proxy.conf b/common/hyperpipe-proxy.conf new file mode 100644 index 0000000..1d5cee1 --- /dev/null +++ b/common/hyperpipe-proxy.conf @@ -0,0 +1,13 @@ +add_header Onion-Location http://hpp.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; +add_header X-I2P-Location http://vernohu6dvnvssx5rnyckb2vulvczx2z5lneiz6xa5rw262zru2q.b32.i2p$request_uri; + +access_log off; +error_log /var/log/nginx/error.log crit; + +location / { + proxy_pass http://10.0.3.57:1520/; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header Host $host; # so Invidious knows domain + proxy_http_version 1.1; # to keep alive + proxy_set_header Connection ""; # to keep alive +} diff --git a/common/librex.conf b/common/librex.conf index 2687375..0f0bd19 100644 --- a/common/librex.conf +++ b/common/librex.conf @@ -11,7 +11,7 @@ location / { } location ~ \.php$ { - fastcgi_pass 192.168.122.53:9005; + fastcgi_pass unix:/var/run/php/php8.1-fpm.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include /etc/nginx/snippets/fastcgi.conf; diff --git a/common/littlelink.conf b/common/littlelink.conf index 7b08c56..2db421f 100644 --- a/common/littlelink.conf +++ b/common/littlelink.conf @@ -17,7 +17,7 @@ location = /robots.txt { access_log off; log_not_found off; } error_page 404 /index.php; location ~ \.php$ { - fastcgi_pass unix:/var/run/php/php8.0-fpm.sock; + fastcgi_pass unix:/var/run/php/php8.1-fpm.sock; fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; include snippets/fastcgi.conf; } diff --git a/common/nextcloud.conf b/common/nextcloud.conf index 267648f..61eed47 100644 --- a/common/nextcloud.conf +++ b/common/nextcloud.conf @@ -111,7 +111,7 @@ location ~ \.php(?:$|/) { fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice fastcgi_param front_controller_active true; # Enable pretty urls - fastcgi_pass unix:/var/run/php/php8.0-fpm.sock; + fastcgi_pass unix:/var/run/php/php8.1-fpm.sock; fastcgi_intercept_errors on; fastcgi_request_buffering off; diff --git a/common/privatebin.conf b/common/privatebin.conf index d3ffdf0..d574e25 100644 --- a/common/privatebin.conf +++ b/common/privatebin.conf @@ -9,7 +9,7 @@ location / { } location ~ \.php$ { - fastcgi_pass unix:/run/php/php8.0-fpm.sock; + fastcgi_pass unix:/run/php/php8.1-fpm.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include /etc/nginx/snippets/fastcgi.conf; diff --git a/common/quetre.conf b/common/quetre.conf index 7c1db32..bd2367d 100644 --- a/common/quetre.conf +++ b/common/quetre.conf @@ -4,12 +4,11 @@ add_header X-I2P-Location http://vernnflenvsqccuanaun7yydnmturi4jkyxlyzhn6ultpje access_log /var/log/nginx/quetre-access.log; location / { - proxy_pass http://192.168.122.53:5002/; + proxy_pass http://10.0.3.57:5068/; 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; - proxy_cache mycache; } if ($http_user_agent = "Mozilla/5.0 (compatible; Farside/0.1.0; +https://farside.link)") { diff --git a/common/roundcube.conf b/common/roundcube.conf index 545cc40..b89dd87 100644 --- a/common/roundcube.conf +++ b/common/roundcube.conf @@ -15,7 +15,7 @@ location ~ \.php(?:$|/) { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param HTTPS on; fastcgi_param modHeadersAvailable true; - fastcgi_pass unix:/run/php/php8.0-fpm.sock; + fastcgi_pass unix:/run/php/php8.1-fpm.sock; fastcgi_intercept_errors on; fastcgi_buffers 4 256k; fastcgi_busy_buffers_size 256k; diff --git a/common/rssbridge.conf b/common/rssbridge.conf index fd1e1e4..1caafc6 100644 --- a/common/rssbridge.conf +++ b/common/rssbridge.conf @@ -9,7 +9,7 @@ location / { } location ~ \.php$ { - fastcgi_pass unix:/run/php/php8.0-fpm.sock; + fastcgi_pass unix:/run/php/php8.1-fpm.sock; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; include /etc/nginx/snippets/fastcgi.conf; diff --git a/common/website.conf b/common/website.conf index d57787f..cb23b3e 100644 --- a/common/website.conf +++ b/common/website.conf @@ -20,7 +20,7 @@ location ~ \.php$ { try_files $uri /$lang$uri /en$uri =404; #NOTE: You should have "cgi.fix_pathinfo = 0;" in php.ini include snippets/fastcgi.conf; - fastcgi_pass unix:/run/php/php8.0-fpm.sock; + fastcgi_pass unix:/run/php/php8.1-fpm.sock; fastcgi_buffers 16 16k; fastcgi_buffer_size 32k; } @@ -159,6 +159,7 @@ location ~ ^/(~|u/)(?[\w-]+)(?/.*)?$ { autoindex_exact_size off; subs_filter_types text/html text/css text/xml application/javascript text/plain; subs_filter (((file|virtual|src|href)=|url\()["']?)/([^/]) $1/u/$user/$4 r; + subs_filter "gcdn.vern.cc" "vernlb7gwnsycyt6fw67ak4qx2nn6vimfjxv6xbuwasmb4j6ivva.b32.i2p"; location ~ \.php$ { fastcgi_pass 192.168.122.30:9000; diff --git a/common/whoogle.conf b/common/whoogle.conf index 2c62d06..8a59ebf 100644 --- a/common/whoogle.conf +++ b/common/whoogle.conf @@ -2,7 +2,7 @@ add_header Onion-Location http://wg.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajh add_header X-I2P-Location http://verneks7rfjptpz5fpii7n7nrxilsidi2qxepeuuf66c3tsf4nhq.b32.i2p$request_uri; location / { - proxy_pass http://192.168.122.53:5001/; + proxy_pass http://10.0.3.57:5015/; proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header Host $host; # so Whoogle knows domain proxy_http_version 1.1; # to keep alive diff --git a/conf.d/00website.conf b/conf.d/00website.conf index e7d31a5..8a91248 100644 --- a/conf.d/00website.conf +++ b/conf.d/00website.conf @@ -153,23 +153,27 @@ server { listen 443 ssl http2; listen [::]:443 ssl http2; include snippets/lets-encrypt.conf; - return 200 127.0.0.1; + default_type text/plain; + return 200 "$remote_addr\n"; } server { server_name myip.vern.cc; listen 80; listen [::]:80; - return 200 127.0.0.1; + default_type text/plain; + return 200 "$remote_addr\n"; } server { server_name myip.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion; listen 80; listen [::]:80; - return 200 127.0.0.1; + default_type text/plain; + return 200 "$remote_addr\n"; } server { server_name vernamluei326jvvjdrdcsi5hcbgiig7anytm3xe3c6lj5jvgmba.b32.i2p; listen 11064; listen [::]:11064; - return 200 127.0.0.1; + default_type text/plain; + return 200 "$remote_addr\n"; } diff --git a/conf.d/nextcloud.conf b/conf.d/nextcloud.conf index aafe658..807abce 100644 --- a/conf.d/nextcloud.conf +++ b/conf.d/nextcloud.conf @@ -1,5 +1,5 @@ upstream php-handler { - server unix:/var/run/php/php8.0-fpm.sock; + server unix:/var/run/php/php8.1-fpm.sock; } # Set the `immutable` cache control options only for assets with a cache busting `v` argument diff --git a/conf.d/quetre.conf b/conf.d/quetre.conf index d1e1fcd..e3a4d48 100644 --- a/conf.d/quetre.conf +++ b/conf.d/quetre.conf @@ -1,4 +1,3 @@ -proxy_cache_path /tmp/cache keys_zone=mycache:10m inactive=60m; server { listen 80; listen [::]:80;