Initial move to consolidate services on ryzen host

apptabulous/reverseproxy/conf.d/reverse_proxy.conf

@@ -22,7 +22,7 @@ server {
     }
 
     location / {
-        proxy_pass http://rpi4-2:3000;
+        proxy_pass http://website:3000;
     }
 }
 
@@ -42,7 +42,7 @@ server {
     # }
 
     location / {
-        proxy_pass http://rpi5-2:3000;
+        proxy_pass http://gitea:3000;
     }
 }
 
@@ -62,44 +62,44 @@ server {
     }
 
     location / {
-        proxy_pass http://rpi4-2:3001;
+        proxy_pass http://apptabulous_website:3000;
     }
 }
 
 # Container registry
-server {
-    listen 80;
-    listen [::]:80;
-    listen 443 ssl;
-    listen [::]:443 ssl;
-    server_name hub.apptabulous.co.uk;
+# server {
+#     listen 80;
+#     listen [::]:80;
+#     listen 443 ssl;
+#     listen [::]:443 ssl;
+#     server_name hub.apptabulous.co.uk;
 
-    ssl_certificate /etc/letsencrypt/live/apptabulous.co.uk/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/apptabulous.co.uk/privkey.pem;
+#     ssl_certificate /etc/letsencrypt/live/apptabulous.co.uk/fullchain.pem;
+#     ssl_certificate_key /etc/letsencrypt/live/apptabulous.co.uk/privkey.pem;
 
-    # disable any limits to avoid HTTP 413 for large image uploads
-    client_max_body_size 0;
+#     # disable any limits to avoid HTTP 413 for large image uploads
+#     client_max_body_size 0;
     
-    # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486)
-    chunked_transfer_encoding on;
+#     # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486)
+#     chunked_transfer_encoding on;
 
-    location / {
-        proxy_pass http://rpi4-2:5000;
-    }
-}
+#     location / {
+#         proxy_pass http://rpi4-2:5000;
+#     }
+# }
 
-# Watchtower
-server {
-    listen 80;
-    listen [::]:80;
-    listen 443 ssl;
-    listen [::]:443 ssl;
-    server_name watchtower.apptabulous.co.uk;
+# # Watchtower
+# server {
+#     listen 80;
+#     listen [::]:80;
+#     listen 443 ssl;
+#     listen [::]:443 ssl;
+#     server_name watchtower.apptabulous.co.uk;
 
-    ssl_certificate /etc/letsencrypt/live/apptabulous.co.uk/fullchain.pem;
-    ssl_certificate_key /etc/letsencrypt/live/apptabulous.co.uk/privkey.pem;
+#     ssl_certificate /etc/letsencrypt/live/apptabulous.co.uk/fullchain.pem;
+#     ssl_certificate_key /etc/letsencrypt/live/apptabulous.co.uk/privkey.pem;
 
-    location / {
-        proxy_pass http://rpi4-2:8080;
-    }
-}
+#     location / {
+#         proxy_pass http://rpi4-2:8080;
+#     }
+# }

apptabulous/reverseproxy/stream.d/ssh.conf

@@ -1,7 +1,9 @@
 # Stream the ssh connections for gitea
-server {
-  listen 2222;
-  proxy_pass rpi5-2:2222;   # the machine where sshd runs (often same as gitea)
-  proxy_timeout 1h;
-  proxy_connect_timeout 10s;
-}
+# The gitea container is running on the same machine as  the reverse proxy for now,
+# so we don't need to stream the ssh connection to another machine.
+# server {
+#   listen 2222;
+#   proxy_pass rpi5-2:2222;   # the machine where sshd runs (often same as gitea)
+#   proxy_timeout 1h;
+#   proxy_connect_timeout 10s;
+# }