Merge 4af9e7f into d0476f5

Author: katzterd

.env-dist

@@ -24,7 +24,6 @@ COMMON_ROOM_CONTROLWORD=
 
 # Endpoint for all gates
 #GATE_ENDPOINT_HOST=onechan
-#GATE_ENDPOINT_PORT=80
 
 # Uncomment to enable torgate
 #TORGATE_HOSTNAME=yourhost.onion

docker-compose.yaml

@@ -44,6 +44,7 @@ services:
       SEARCHD_PID_FILE: "searchd.pid"
     ports:
       - "80:80"
+      - "81:81"
     volumes:
       - www-smilies:/src/www/img/smilies
       - www-homeboards:/src/www/ico/homeboards

docker/config/1chan/nginx.conf

@@ -119,4 +119,73 @@ http {
         }
 
     }
+    
+    server {
+
+        listen 81 proxy_protocol;
+        server_name ~^[a-z0-9]+\.onion$;
+        
+        root /src/www;
+        index index.php;
+        
+        real_ip_header proxy_protocol;
+        real_ip_recursive on;
+        
+         # local
+        set_real_ip_from 192.168.0.0/16;
+        set_real_ip_from 172.16.0.0/12;
+        set_real_ip_from 10.0.0.0/8;
+        set_real_ip_from fc00::/7;
+        
+        client_max_body_size 5m;
+        client_body_timeout 60;
+
+        # Add CORS headers globally
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+        add_header 'Access-Control-Allow-Headers' 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
+
+        location ~ ^/(socket\.io|broadcast)/ {
+        
+            proxy_pass http://127.0.0.1:9393;
+            proxy_http_version 1.1;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "Upgrade";
+            proxy_connect_timeout 7d;
+            proxy_send_timeout 7d;
+            proxy_read_timeout 7d;
+          
+        }
+
+        location / {
+
+            if (!-e $request_filename) {
+                rewrite  ^(/.*)$  /index.php?q=$1  last;
+                break;
+            }
+
+        }
+
+        location ~ \.php$ {
+
+            include /etc/nginx/fastcgi_params;
+            fastcgi_intercept_errors on;
+            fastcgi_index index.php;
+            fastcgi_pass localhost:9000;
+            fastcgi_param SCRIPT_FILENAME $request_filename;
+
+        }
+
+        location ~* ^(?!.*socket\.io\.js).*\.(js|css|png|jpg|jpeg|gif|ico)$ {
+
+            try_files $uri /index.php;
+            expires max;
+            log_not_found off;
+
+        }
+        
+    }
 }

docker/config/i2pgate/init.sh

@@ -14,13 +14,6 @@ else
     sed -i 's/\__GATE_ENDPOINT_HOST__/'"${GATE_ENDPOINT_HOST}"'/g' /etc/i2pd/tunnels.conf
 fi
 
-if [ -z "${GATE_ENDPOINT_PORT}" ]; then
-    echo "GATE_ENDPOINT_PORT environment var is undefined, i2pgate will be disabled";
-    exit 0;
-else
-    sed -i 's/\__GATE_ENDPOINT_PORT__/'"${GATE_ENDPOINT_PORT}"'/' /etc/i2pd/tunnels.conf
-fi
-
-printf "i2pgate started: ${GATE_ENDPOINT_HOST}:${GATE_ENDPOINT_PORT}\n\n"
+printf "i2pgate started: ${GATE_ENDPOINT_HOST}:80\n\n"
 
 i2pd --service --conf /etc/i2pd/i2pd.conf

docker/config/i2pgate/tunnels.conf

@@ -1,5 +1,5 @@
 [__GATE_ENDPOINT_HOST__]
 type = http
 host = __GATE_ENDPOINT_HOST__  
-port = __GATE_ENDPOINT_PORT__
+port = 80
 keys = secret_key.dat

docker/config/torgate/cron.sh

@@ -30,14 +30,7 @@ else
     sed -i 's/\__GATE_ENDPOINT_HOST__/'"${GATE_ENDPOINT_HOST}"'/' /etc/tor/torrc
 fi
 
-if [ -z "${GATE_ENDPOINT_PORT}" ]; then
-    echo "GATE_ENDPOINT_PORT environment var is undefined, torgate will be disabled";
-    exit 0;
-else
-    sed -i 's/\__GATE_ENDPOINT_PORT__/'"${GATE_ENDPOINT_PORT}"'/' /etc/tor/torrc
-fi
-
 chmod -R 600 /var/lib/tor/hidden_service
-echo "Torgate started: ${TORGATE_HOSTNAME} -> ${GATE_ENDPOINT_HOST}:${GATE_ENDPOINT_PORT}"
+echo "Torgate started: ${TORGATE_HOSTNAME} -> ${GATE_ENDPOINT_HOST}:81"
 
 tor

docker/config/torgate/init.sh

@@ -70,7 +70,8 @@ RunAsDaemon 0
 ## address y:z.
 
 HiddenServiceDir /var/lib/tor/hidden_service/
-HiddenServicePort 80 __GATE_ENDPOINT_HOST__:__GATE_ENDPOINT_PORT__
+HiddenServiceExportCircuitID haproxy
+HiddenServicePort 80 __GATE_ENDPOINT_HOST__:81
 
 #HiddenServiceDir /var/lib/tor/other_hidden_service/
 #HiddenServicePort 80 127.0.0.1:80

docker/config/torgate/supervisord.conf

@@ -23,17 +23,10 @@ if [[ -z $@ ]]; then
         sed -i 's/\__GATE_ENDPOINT_HOST__/'"${GATE_ENDPOINT_HOST}"'/g' ./supervisord.conf
     fi
 
-    if [ -z "${GATE_ENDPOINT_PORT}" ]; then
-        echo "GATE_ENDPOINT_PORT environment var is undefined, yggdrasil will be disabled";
-        exit 0;
-    else
-        sed -i 's/\__GATE_ENDPOINT_PORT__/'"${GATE_ENDPOINT_PORT}"'/g' ./supervisord.conf
-    fi
-    
 printf "Updating peers...\n\n"
 ./peers_updater -c ./yggdrasil.conf -n 5 -u
 
-printf "yggdrasil started: ${GATE_ENDPOINT_HOST}:${GATE_ENDPOINT_PORT}\n\n"
+printf "yggdrasil started: ${GATE_ENDPOINT_HOST}:80\n\n"
 supervisord -c ./supervisord.conf
 
 fi