diff --git a/deploy/i2p b/deploy/i2p index a45658228..aabea5d18 100755 --- a/deploy/i2p +++ b/deploy/i2p @@ -352,51 +352,32 @@ echo "Creating nginx virtual host for http://${I2P_DOMAIN}" echo ' error_log /dev/null;'; echo ''; echo ' index index.html;'; + echo ''; + echo ' location /newsmirror {'; + echo " root /var/www/${I2P_DOMAIN}/htdocs;"; + echo ' try_files $uri =404;'; + echo ' }'; + echo ''; echo ' location / {'; - echo ' proxy_http_version 1.1;'; - echo ' client_max_body_size 31M;'; - echo " proxy_hide_header Upgrade;"; - echo ' proxy_hide_header Connection;'; - echo " proxy_set_header Host \$http_host;"; - echo " proxy_set_header X-Real-IP \$remote_addr;"; - echo " proxy_set_header X-Forward-For \$proxy_add_x_forwarded_for;"; - echo ' proxy_set_header X-Forward-Proto http;'; - echo ' proxy_set_header X-Nginx-Proxy true;'; - echo ' proxy_set_header Upgrade-Insecure-Requests false;'; - echo ' expires epoch;'; - echo ' proxy_no_cache 1;'; - echo ' proxy_temp_file_write_size 64k;'; - echo ' proxy_connect_timeout 10080s;'; - echo ' proxy_send_timeout 10080;'; - echo ' proxy_read_timeout 10080;'; - echo ' proxy_buffer_size 64k;'; - echo ' proxy_buffers 16 32k;'; - echo ' proxy_busy_buffers_size 64k;'; - echo ' proxy_redirect off;'; - echo ' proxy_request_buffering off;'; - echo ' proxy_buffering on;'; - echo ' proxy_cache my_cache;'; - echo ' proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;'; - echo " location ~ ^/(icons|images|media|emoji)/(.*)/(.*).(png|jpg|gif|webp|mp3|ogv|ogg|mp4) {"; - echo ' expires 7d;'; - echo " proxy_pass http://localhost:${EPICYON_PORT};"; - echo ' }'; - echo " location ~ ^/icons/(.*)/(like|repeat|calendar)(.*).(png|jpg|gif|webp|mp3|ogv|ogg|mp4) {"; - echo ' expires epoch;'; - echo ' proxy_no_cache 1;'; - echo " proxy_pass http://localhost:${EPICYON_PORT};"; - echo ' }'; - echo " location ~ ^/icons/(like|repeat|calendar)(.*).(png|jpg|gif|webp|mp3|ogv|ogg|mp4) {"; - echo ' expires epoch;'; - echo ' proxy_no_cache 1;'; - echo " proxy_pass http://localhost:${EPICYON_PORT};"; - echo ' }'; - echo " location ~ ^/users/(.*)/(image|banner).(png|jpg|gif|webp|mp3|ogv|ogg|mp4) {"; - echo ' expires epoch;'; - echo ' proxy_no_cache 1;'; - echo " proxy_pass http://localhost:${EPICYON_PORT};"; - echo ' }'; - echo " proxy_pass http://localhost:${EPICYON_PORT};"; + echo ' proxy_http_version 1.1;'; + echo ' client_max_body_size 31M;'; + echo " proxy_set_header Host \$http_host;"; + echo " proxy_set_header X-Real-IP \$remote_addr;"; + echo " proxy_set_header X-Forward-For \$proxy_add_x_forwarded_for;"; + echo ' proxy_set_header X-Forward-Proto http;'; + echo ' proxy_set_header X-Nginx-Proxy true;'; + echo ' proxy_temp_file_write_size 64k;'; + echo ' proxy_connect_timeout 10080s;'; + echo ' proxy_send_timeout 10080;'; + echo ' proxy_read_timeout 10080;'; + echo ' proxy_buffer_size 64k;'; + echo ' proxy_buffers 16 32k;'; + echo ' proxy_busy_buffers_size 64k;'; + echo ' proxy_redirect off;'; + echo ' proxy_request_buffering off;'; + echo ' proxy_buffering off;'; + echo " proxy_pass http://localhost:${EPICYON_PORT};"; + echo ' tcp_nodelay on;'; echo ' }'; echo '}'; } > /etc/nginx/sites-available/epicyon-i2p diff --git a/deploy/onion b/deploy/onion index da3a776dd..cc214f758 100755 --- a/deploy/onion +++ b/deploy/onion @@ -281,49 +281,25 @@ echo "Creating nginx virtual host for ${ONION_DOMAIN}" echo ' }'; echo ''; echo ' location / {'; - echo ' proxy_http_version 1.1;'; - echo ' client_max_body_size 31M;'; - echo " proxy_hide_header Upgrade;"; - echo ' proxy_hide_header Connection;'; - echo " proxy_set_header Host \$http_host;"; - echo " proxy_set_header X-Real-IP \$remote_addr;"; - echo " proxy_set_header X-Forward-For \$proxy_add_x_forwarded_for;"; - echo ' proxy_set_header X-Forward-Proto http;'; - echo ' proxy_set_header X-Nginx-Proxy true;'; - echo ' expires epoch;'; - echo ' proxy_no_cache 1;'; - echo ' proxy_temp_file_write_size 64k;'; - echo ' proxy_connect_timeout 10080s;'; - echo ' proxy_send_timeout 10080;'; - echo ' proxy_read_timeout 10080;'; - echo ' proxy_buffer_size 64k;'; - echo ' proxy_buffers 16 32k;'; - echo ' proxy_busy_buffers_size 64k;'; - echo ' proxy_redirect off;'; - echo ' proxy_request_buffering off;'; - echo ' proxy_buffering on;'; - echo ' proxy_cache my_cache;'; - echo ' proxy_cache_use_stale error timeout http_500 http_502 http_503 http_504;'; - echo " location ~ ^/(icons|images|media|emoji)/(.*)/(.*).(png|jpg|gif|webp|mp3|ogv|ogg|mp4) {"; - echo ' expires 7d;'; - echo " proxy_pass http://localhost:${EPICYON_PORT};"; - echo ' }'; - echo " location ~ ^/icons/(.*)/(like|repeat|calendar)(.*).(png|jpg|gif|webp|mp3|ogv|ogg|mp4) {"; - echo ' expires epoch;'; - echo ' proxy_no_cache 1;'; - echo " proxy_pass http://localhost:${EPICYON_PORT};"; - echo ' }'; - echo " location ~ ^/icons/(like|repeat|calendar)(.*).(png|jpg|gif|webp|mp3|ogv|ogg|mp4) {"; - echo ' expires epoch;'; - echo ' proxy_no_cache 1;'; - echo " proxy_pass http://localhost:${EPICYON_PORT};"; - echo ' }'; - echo " location ~ ^/users/(.*)/(image|banner).(png|jpg|gif|webp|mp3|ogv|ogg|mp4) {"; - echo ' expires epoch;'; - echo ' proxy_no_cache 1;'; - echo " proxy_pass http://localhost:${EPICYON_PORT};"; - echo ' }'; - echo " proxy_pass http://localhost:${EPICYON_PORT};"; + echo ' proxy_http_version 1.1;'; + echo ' client_max_body_size 31M;'; + echo " proxy_set_header Host \$http_host;"; + echo " proxy_set_header X-Real-IP \$remote_addr;"; + echo " proxy_set_header X-Forward-For \$proxy_add_x_forwarded_for;"; + echo ' proxy_set_header X-Forward-Proto http;'; + echo ' proxy_set_header X-Nginx-Proxy true;'; + echo ' proxy_temp_file_write_size 64k;'; + echo ' proxy_connect_timeout 10080s;'; + echo ' proxy_send_timeout 10080;'; + echo ' proxy_read_timeout 10080;'; + echo ' proxy_buffer_size 64k;'; + echo ' proxy_buffers 16 32k;'; + echo ' proxy_busy_buffers_size 64k;'; + echo ' proxy_redirect off;'; + echo ' proxy_request_buffering off;'; + echo ' proxy_buffering off;'; + echo " proxy_pass http://localhost:${EPICYON_PORT};"; + echo ' tcp_nodelay on;'; echo ' }'; echo '}'; } > "/etc/nginx/sites-available/${username}"