1 files changed, 71 insertions, 66 deletions

diff --git a/tools/nginx.html b/tools/nginx.html
index 21abb90..937be15 100644
--- a/tools/nginx.html
+++ b/tools/nginx.html
@@ -273,10 +273,18 @@
 
         <pre>
         server {
-            listen 80 default_server;
+        #if ($http_user_agent ~* (AhrefsBot|SemrushBot|MJ12Bot|DotBot)) {
+        #     return 410;
+        #}
             server_name tribu.semdestino.org;
-
+            listen 80 default_server;
             listen 443 ssl default_server;
+
+            access_log syslog:server=unix:/dev/log,facility=daemon,tag=nginx_vhost,nohostname main;
+            error_log syslog:server=unix:/dev/log,facility=daemon,tag=nginx_vhost_err,nohostname debug;
+
+            root /etc/nginx/html/;
+
             ssl_certificate /etc/letsencrypt/live/tribu.semdestino.org/fullchain.pem;
             ssl_certificate_key /etc/letsencrypt/live/tribu.semdestino.org/privkey.pem;
             ssl_trusted_certificate /etc/letsencrypt/live/tribu.semdestino.org/chain.pem;
@@ -291,55 +299,67 @@
             ssl_stapling on;
             ssl_stapling_verify on;
 
-            access_log syslog:server=unix:/dev/log,facility=daemon,tag=nginx_vhost,nohostname main;
-            error_log syslog:server=unix:/dev/log,facility=daemon,tag=nginx_vhost_err,nohostname debug;
-
-            root /etc/html/;
-
-            location /doc {
-                alias /srv/www/doc;
-                index index.html;
-            }
-
-            location /pub {
-                proxy_pass http://wiki.c2.ank:8080;
-            }
-
-            location /wiki {
-                proxy_pass http://wiki.c2.ank:8080;
-            }
-
-            location /git {
-                proxy_pass http://git.c2.ank:8080;
-            }
-
-            location /forum {
-                proxy_pass http://forum.c2.ank:8080;
-            }
-
-            location /task {
-                proxy_pass http://task.c2.ank:8080;
-            }
-
-            location /shop {
-                proxy_pass http://shop.c2.ank:8080;
-            }
+            #proxy_redirect off;
+            #proxy_set_header Host $http_host;
+            #proxy_set_header X-Forwarded-Host $http_host;
+            #proxy_set_header X-Real-IP $remote_addr;
+            #proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
-            location /email {
-                proxy_pass http://email.c2.ank:8080;
+           location /doc {
+               alias /srv/www/doc;
+               index index.html;
+                autoindex on;
             }
 
-            location /mirror {
-                proxy_pass http://c1.ank;
-            }
-
-            # ACME challenge
-            location ^~ /.well-known {
-                proxy_pass http://wiki.c2.ank;
-            }
-
-            location / {
-                proxy_pass http://frontpage.c2.ank;
+           location /mirror {
+               proxy_pass http://ports.ank;
+           }
+
+           location /pub {
+               proxy_pass http://wiki.server.ank:8080;
+           }
+           location ^~ /.well-known {
+               # ACME challenge
+               proxy_pass http://wiki.server.ank;
+           }
+           location /wiki {
+                proxy_pass http://wiki.server.ank:8080;
+           }
+
+           location /git {
+               proxy_pass http://git.server.ank:8080;
+           }
+
+           location /forum/ {
+                proxy_pass http://forum.server.ank:8080/;
+           }
+
+           location /task {
+               proxy_pass http://task.server.ank:8080;
+           }
+
+           location /shop {
+                proxy_pass http://shop.server.ank:8080;
+           }
+
+           location /vexim/ {
+               proxy_pass http://vexim.server.ank:8080/;
+           }
+
+           location /email {
+               proxy_pass http://email.server.ank:8080;
+           }
+
+           location /awstats {
+               proxy_pass http://awstats.server.ank:8080;
+           }
+
+           location /stats {
+               proxy_pass http://stats.server.ank:8080;
+           }
+
+           location / {
+                proxy_pass http://frontpage.server.ank:8080/;
             }
         }
         </pre>
@@ -357,17 +377,16 @@
         <pre>
         server {
             listen 8080;
-            server_name wiki.c2.ank;
+            server_name wiki.server.ank;
 
-            access_log syslog:server=unix:/dev/log,facility=daemon,tag=vh_wiki,nohostname main;
-            error_log syslog:server=unix:/dev/log,facility=daemon,tag=vh_wiki_err,nohostname debug;
+            access_log syslog:server=unix:/dev/log,facility=daemon,tag=vh_tribu,nohostname main;
+            error_log syslog:server=unix:/dev/log,facility=daemon,tag=vh_tribu_err,nohostname debug;
 
             root /srv/www/;
 
             location /pub {
                 alias /srv/www/wiki/pub;
             }
-
             # ACME challenge
             location ^~ /.well-known {
                 allow all;
@@ -397,20 +416,6 @@
         }
         </pre>
 
-        <p>Change /srv/www/default/flyspray/index.php to;</p>
-
-        <pre>
-        &lt?php
-        /*
-           This is the main script that everything else is included
-           in.  Mostly what it does is check the user permissions
-           to see what they have access to.
-        */
-        define('IN_FS', true);
-        $_SERVER['SCRIPT_NAME'] = "/bug/index.php";
-        require_once(dirname(__FILE__).'/header.php');
-        </pre>
-
         <h2 id="userdir">5. User Directory</h2>
 
         <p><a href="http://wiki.nginx.org/UserDir">Nginx Wiki UserDir</a></p>