From 76da1f2b6d4521002532e14eb763f37f541d66bf Mon Sep 17 00:00:00 2001
From: Matthew Spencer <matthew@thespencers.me.uk>
Date: Fri, 28 Feb 2025 11:34:56 +0000
Subject: [PATCH] Add apptabulous website

Fixup reverse-proxy conf
The server_name is sensitive to where in the block it is defined

Signed-off-by: Matt Spencer matthew@thespencers.me.uk
---
 .../reverseproxy/conf.d/reverse_proxy.conf    | 32 +++++++++++++++----
 frontend.yaml                                 | 11 ++++++-
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/apptabulous/reverseproxy/conf.d/reverse_proxy.conf b/apptabulous/reverseproxy/conf.d/reverse_proxy.conf
index dec3f70..989dd7c 100755
--- a/apptabulous/reverseproxy/conf.d/reverse_proxy.conf
+++ b/apptabulous/reverseproxy/conf.d/reverse_proxy.conf
@@ -6,18 +6,17 @@ map $request_uri $block_uri {
     /etc 1;
 }
 
-# Webserver
+# m5p3nc3r webserver
 server {
     listen 80;
     listen [::]:80;
     listen 443 ssl;
     listen [::]:443 ssl;
+    server_name m5p3nc3r.co.uk www.m5p3nc3r.co.uk;
 
     ssl_certificate /etc/letsencrypt/live/apptabulous.co.uk/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/apptabulous.co.uk/privkey.pem;
 
-    server_name apptabulous.co.uk www.apptabulous.co.uk;
-
     if ($block_uri = 1) {
         return 403;
     }
@@ -27,12 +26,34 @@ server {
     }
 }
 
+
+# apptabulous webserver
+server {
+    listen 80;
+    listen [::]:80;
+    listen 443 ssl;
+    listen [::]:443 ssl;
+    server_name apptabulous.co.uk www.apptabulous.co.uk;
+
+    ssl_certificate /etc/letsencrypt/live/apptabulous.co.uk/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/apptabulous.co.uk/privkey.pem;
+
+    if ($block_uri = 1) {
+        return 403;
+    }
+
+    location / {
+        proxy_pass http://rpi4-2:3001;
+    }
+}
+
 # Container registry
 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;
@@ -43,8 +64,6 @@ server {
     # required to avoid HTTP 411: see Issue #1486 (https://github.com/docker/docker/issues/1486)
     chunked_transfer_encoding on;
 
-    server_name hub.apptabulous.co.uk;
-
     location / {
         proxy_pass http://rpi4-2:5000;
     }
@@ -56,12 +75,11 @@ server {
     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;
 
-    server_name watchtower.apptabulous.co.uk;
-
     location / {
         proxy_pass http://rpi4-2:8080;
     }
diff --git a/frontend.yaml b/frontend.yaml
index f365218..e6e4906 100755
--- a/frontend.yaml
+++ b/frontend.yaml
@@ -83,7 +83,7 @@
         username: "{{ secrets.GITHUB_ACTOR }}"
         password: "{{ secrets.GITHUB_TOKEN }}"
 
-    - name: Start website
+    - name: Start m5p3nc3r website
       community.docker.docker_container:
         name: website
         image: ghcr.io/m5p3nc3r/website:main
@@ -94,6 +94,15 @@
           - "3000:3000"
         state: started
 
+    - name: Start Apptabulous website
+      community.docker.docker_container:
+        name: apptabulous_website
+        image: ghcr.io/m5p3nc3r/apptabulous_website:main
+        restart_policy: always
+        ports:
+          - "3001:3000"
+        state: started
+
     - name: Start watchtower
       community.docker.docker_container:
         name: watchtower