.gitea/workflows/ci.yml

@@ -1,25 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - master
-
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  deploy:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - name: Install Docker
-        run: curl -fsSL https://get.docker.com | sh
-
-      - name: Deploy with Docker
-        run: docker compose up --build -d
-

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "web"]
 	path = web
-	url = https://git.thehrz.net/thehrz/ipv6-test-frontend
+	url = https://git.thehrz.net/thehrz/ipv6-test.git

docker-compose.yml

@@ -19,6 +19,7 @@ services:
     container_name: ipv6-test-backend
     restart: always
     networks:
+      - traefik
       - ipv6-test
   nginx:
     build: ./nginx
@@ -26,9 +27,10 @@ services:
     restart: always
     labels:
       - traefik.enable=true
-      - traefik.http.routers.ipv6-test.rule=Host(`test.ipv6test.online`) || Host(`4.ipv6test.online`) || Host(`6.ipv6test.online`)
+      - traefik.http.routers.ipv6-test.rule=Host(`ipv6-test.thehrz.net`)
       - traefik.http.routers.ipv6-test.entrypoints=web,websecure
       - traefik.http.routers.ipv6-test.tls.certresolver=letsencrypt
+      - traefik.http.services.ipv6-test.loadbalancer.server.port=3000
     networks:
       - traefik
       - ipv6-test

nginx/conf.d/4.conf

@@ -1,20 +0,0 @@
-server {
-  listen 80;
-  server_name 4.ipv6test.online;
-
-  gzip on;
-  gzip_min_length 1k;
-  gzip_buffers 4 16k;
-  gzip_http_version 1.1;
-  gzip_comp_level 9;
-  gzip_types text/plain application/x-javascript text/css application/xml text/javascript application/javascript application/json;
-  gzip_disable "MSIE [1-6]\.";
-  gzip_vary on;
-
-  location / {
-    proxy_pass http://ipv6-test-backend:8080/;
-    proxy_read_timeout 60;
-    proxy_connect_timeout 60;
-    proxy_redirect off;
-  }
-}

nginx/conf.d/root.conf

@@ -1,20 +0,0 @@
-server {
-  listen [::]:80;
-  server_name ipv6test.online;
-
-  gzip on;
-  gzip_min_length 1k;
-  gzip_buffers 4 16k;
-  gzip_http_version 1.1;
-  gzip_comp_level 9;
-  gzip_types text/plain application/x-javascript text/css application/xml text/javascript application/javascript application/json;
-  gzip_disable "MSIE [1-6]\.";
-  gzip_vary on;
-
-  location / {
-    proxy_pass http://ipv6-test-frontend:3000;
-    proxy_read_timeout 60;
-    proxy_connect_timeout 60;
-    proxy_redirect off;
-  }
-}

nginx/conf.d/test.conf

@@ -1,18 +0,0 @@
-server {
-  listen 80;
-  listen [::]:80;
-  server_name test.ipv6test.online;
-
-  gzip on;
-  gzip_min_length 1k;
-  gzip_buffers 4 16k;
-  gzip_http_version 1.1;
-  gzip_comp_level 9;
-  gzip_types text/plain application/x-javascript text/css application/xml text/javascript application/javascript application/json;
-  gzip_disable "MSIE [1-6]\.";
-  gzip_vary on;
-
-  location / {
-    proxy_pass http://ipv6-test-backend:8080/;
-  }
-}

nginx/conf.d/www.conf

@@ -1,6 +1,11 @@
+upstream backend {
+  server backend:8080;
+}
+
 server {
+  listen 80;
   listen [::]:80;
-  server_name 6.ipv6test.online;
+  server_name ipv6.thehrz.net;
 
   gzip on;
   gzip_min_length 1k;
@@ -12,9 +17,13 @@ server {
   gzip_vary on;
 
   location / {
-    proxy_pass http://ipv6-test-backend:8080/;
+    proxy_pass http://frontend:3000;
     proxy_read_timeout 60;
     proxy_connect_timeout 60;
     proxy_redirect off;
   }
+
+  location ^~ /api/ {
+    proxy_pass http://backend/;
+  }
 }

web

@@ -1 +1 @@
-Subproject commit a6b4fe0222e873bb27ee28f20cb6c1d4f02c0e51
+Subproject commit fe04e92e04edc6faefa87a3121cc287544df32bd