From 9e0e5809e79bb62c77ecc4c6a0d6c3d46d734d74 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 13 Jan 2023 14:24:19 +0000 Subject: [PATCH] Remove fulltextrss --- common/fulltextrss.conf | 16 ---------------- common/mikuinv.conf | 10 ++++++++++ conf.d/fulltextrss.conf | 33 --------------------------------- conf.d/mikuinv.conf | 28 ++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 49 deletions(-) delete mode 100644 common/fulltextrss.conf create mode 100644 common/mikuinv.conf delete mode 100644 conf.d/fulltextrss.conf create mode 100644 conf.d/mikuinv.conf diff --git a/common/fulltextrss.conf b/common/fulltextrss.conf deleted file mode 100644 index 71a0f99..0000000 --- a/common/fulltextrss.conf +++ /dev/null @@ -1,16 +0,0 @@ -add_header Onion-Location http://ftr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; -add_header X-I2P-Location http://vernz3gvdqo6dtfaqmbwqrgzfmhwblfbonvtumo63f3q3h7cr5eq.b32.i2p$request_uri; - -root /var/www/full-text-rss; -index index.php index.html index.htm; - -location / { - try_files $uri $uri/ /index.php; -} - -location ~ \.php$ { - fastcgi_pass unix:/run/php/php5.6-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/mikuinv.conf b/common/mikuinv.conf new file mode 100644 index 0000000..0b329d5 --- /dev/null +++ b/common/mikuinv.conf @@ -0,0 +1,10 @@ +add_header Onion-Location http://mi.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion$request_uri; +#add_header X-I2P-Location http://verncceu2kgz54wi7r5jatgmx2mqtsh3knxhiy4m5shescuqtqfa.b32.i2p/socks/$user/$site$request_uri; + +ssi on; + +location / { + proxy_pass http://mikuinv/; + proxy_set_header Host mi.vern.cc; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; +} diff --git a/conf.d/fulltextrss.conf b/conf.d/fulltextrss.conf deleted file mode 100644 index 0c0b947..0000000 --- a/conf.d/fulltextrss.conf +++ /dev/null @@ -1,33 +0,0 @@ -server { - listen 80; - listen [::]:80; - - server_name ftr.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion fulltextrss.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion; - - include common/fulltextrss.conf; -} - -server { - listen 11083; - listen [::]:11083; - - server_name vernz3gvdqo6dtfaqmbwqrgzfmhwblfbonvtumo63f3q3h7cr5eq.b32.i2p; - - include common/fulltextrss.conf; -} - -server { - listen 443 ssl http2; - listen [::]:443 ssl http2; - server_name ftr.vern.cc fulltextrss.vern.cc; - include snippets/lets-encrypt.conf; - include common/fulltextrss.conf; -} - -server { - listen 80; - listen [::]:80; - return 301 https://$host$request_uri; - server_name ftr.vern.cc fulltextrss.vern.cc; -} - diff --git a/conf.d/mikuinv.conf b/conf.d/mikuinv.conf new file mode 100644 index 0000000..131e924 --- /dev/null +++ b/conf.d/mikuinv.conf @@ -0,0 +1,28 @@ +upstream mikuinv { + server unix:/var/socks/mikuinv.sock; +} + +server { + listen 443 ssl http2; + listen [::]:443 ssl http2; + server_name mikuinv.vern.cc mi.vern.cc; + include snippets/lets-encrypt.conf; + + include common/mikuinv.conf; +} + +server { + listen 80; + listen [::]:80; + return 301 https://$host$request_uri; + server_name mikuinv.vern.cc mi.vern.cc; +} + +server { + listen 80; + listen [::]:80; + + server_name mikuinv.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion mi.vernccvbvyi5qhfzyqengccj7lkove6bjot2xhh5kajhwvidqafczrad.onion; + + include common/mikuinv.conf; +}