Update .woodpecker.yml

2024-01-17 19:21:39 -05:00
8 changed files with 99 additions and 141 deletions
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -8,12 +8,48 @@ clone:
      partial: false
      depth: 1
 steps:
-  deploy:
-    name: deploy
-    image: docker:latest
+  run-post-deploy-smoke-tests:
+    name: run-post-deploy-smoke-tests
+    image: git.nixc.us/colin/playwright:latest
+    secrets: [REGISTRY_USER, REGISTRY_PASSWORD]
+    when:
+      - branch: main
+      - path:
+          include: [ 'stack.yml', 'docker-compose.yml', 'Dockerfile.*', '.woodpecker.yml', '*.tests.ts' ]
+  build-push:
+    name: build-push
+    when:
+      - path:
+          include: [ 'stack.yml','.woodpecker.yml', 'Dockerfile', 'docker-entrypoint.sh', 'nginx.conf', 'README.md' ]
+    image: woodpeckerci/plugin-docker-buildx
    secrets: [REGISTRY_USER, REGISTRY_PASSWORD]
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
    commands:
-      # - docker login -u $${REGISTRY_USER} -p $${REGISTRY_PASSWORD} git.nixc.us
-      - docker stack deploy --with-registry-auth -c ./truenas.yml truenas
+      - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us
+      - echo compose up build
+      - docker compose build
+      - echo compose push
+      - docker compose push
+      - echo docker compose rm -f
+      - docker compose rm -f
+  deploy-config:
+    name: deploy-config
+    when:
+      - path:
+          include: [ 'stack.yml','.woodpecker.yml', 'Dockerfile', 'docker-entrypoint.sh', 'nginx.conf', 'README.md' ]
+    image: woodpeckerci/plugin-docker-buildx
+    secrets: [REGISTRY_USER, REGISTRY_PASSWORD]
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    commands:
+    #   - echo "$${REGISTRY_PASSWORD}" | docker login -u "$${REGISTRY_USER}" --password-stdin git.nixc.us
+      - docker stack deploy --with-registry-auth -c ./stack.yml lan-to-nginx
+  run-post-deploy-smoke-tests:
+    name: run-post-deploy-smoke-tests
+    image: git.nixc.us/colin/playwright:latest
+    secrets: [REGISTRY_USER, REGISTRY_PASSWORD]
+    when:
+      - branch: main
+      - path:
+          include: [ 'stack.yml', 'docker-compose.yml', 'Dockerfile.*', '.woodpecker.yml', '*.tests.ts' ]
--- a/8
+++ b/8
@ -1,11 +1,5 @@
-# Start from the official Nginx image
 FROM nginx:alpine
-
-# Copy our custom Nginx configuration and script
 COPY nginx.conf /etc/nginx/nginx.conf.template
 COPY docker-entrypoint.sh /docker-entrypoint.sh
-# Make the script executable
 RUN chmod +x /docker-entrypoint.sh
-
-ENTRYPOINT ["/docker-entrypoint.sh"]
-
+ENTRYPOINT ["/docker-entrypoint.sh"]
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,14 +1,8 @@
 version: '3.9'  

 services:
-  nginx-proxy:
+  lan-to-nginx:
    build:  
      context: .  
      dockerfile: Dockerfile  
-    image: codeberg.org/iridium-net/lan-to-nginx:truenas
-    environment:
-      - BACKEND_ADDRESS=192.168.8.1 # Replace with your backend address
-      - BACKEND_PORT=80  # Replace with your backend port
-    ports:
-      - "80:80"  # Map port 80 from the host to port 80 in the container
-
+    image: git.nixc.us/colin/lan-to-nginx:latest
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@ -4,15 +4,11 @@ PROTOCOL="${PROTOCOL:-http}"

 # Replace placeholders with environment variable values
 envsubst '$BACKEND_ADDRESS $BACKEND_PORT $PROTOCOL $MATOMO_URL $MATOMO_SITE_ID' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
-# Substitute environment variables in matomo.js
-envsubst '$MATOMO_URL $MATOMO_SITE_ID' < /matomo.js.template > /matomo.js

 # Start nginx in the foreground
 curl -k -I $PROTOCOL://$BACKEND_ADDRESS:$BACKEND_PORT
 echo checking nginx modules
 nginx -V 2>&1 | grep -o http_sub_module
-echo /matomo.js
-cat /matomo.js
 echo /etc/nginx/nginx.conf
 cat /etc/nginx/nginx.conf
 exec nginx -g 'daemon off;'
--- a/nginx.conf
+++ b/nginx.conf
@ -1,44 +1,44 @@
-user  nginx;
-worker_processes  1;
+user nginx;
+worker_processes 1;

 events {
-    worker_connections  1024;
+    worker_connections 1024;
 }

 http {
-    default_type  application/octet-stream;
+    default_type application/octet-stream;

    server {
        listen 80;
-	
-	add_header Content-Security-Policy "default-src * 'unsafe-inline' 'unsafe-eval'; img-src * data:; font-src * data:;";
-#	add_header Content-Security-Policy "default-src 'self'; script-src 'self' https://ack.nixc.us; style-src 'self'; img-src 'self'; font-src 'self'; connect-src 'self'; frame-ancestors 'self'; form-action 'self';";
-        # Define MIME type
-        types {
-            text/html html htm shtml;
+
+        # Health check location at a secret path
+        location /secret-health-path {
+            add_header Content-Type text/plain;
+            return 200 'Healthy';
        }

        location / {
-            # Use the placeholders for the proxy pass
-            proxy_pass ${PROTOCOL}://${BACKEND_ADDRESS}:${BACKEND_PORT};
+            # Proxy pass to the backend using environment variables with HTTP explicitly
+            proxy_pass http://${BACKEND_ADDRESS}:${BACKEND_PORT};
+
+            # General proxy settings
            proxy_http_version 1.1;
-            proxy_set_header Upgrade $http_upgrade;
-            proxy_set_header Connection "Upgrade";
            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 Accept-Encoding "";
            proxy_buffering off;
-            proxy_ssl_verify off;  # Skip SSL verification, be cautious

-            # Enable response body filtering
-            sub_filter_once off;
+            # Remove headers that might hint at HTTPS usage
+            proxy_set_header X-Forwarded-Proto "";
+            proxy_set_header X-Forwarded-Ssl "";
+            proxy_set_header X-Url-Scheme "";

-            # Inject the Matomo content just before </head>
-            sub_filter '</body>' '<script async src="https://ack.nixc.us/tracker.js" data-ackee-server="https://ack.nixc.us" data-ackee-domain-id="9608c1ff-b08c-4781-ae7e-cee6eb415bf3"></script></body>';
-            sub_filter_types application/xml application/json text/css text/javascript application/javascript text/plain;
+            # Disable proxy_ssl_verify if you're not using HTTPS at all
+            proxy_ssl_verify off;

+            # Do not pass through the Connection header from the client
+            proxy_set_header Connection "";
        }
-
    }
 }
--- a/stack.yml
+++ b/stack.yml
@ -0,0 +1,28 @@
+version: "3.9"
+
+networks:
+  traefik:
+    external: true
+
+services:
+  nginx:
+    image: git.nixc.us/colin/lan-to-nginx:latest
+    environment:
+      - BACKEND_ADDRESS=ingress.nixc.us
+      - BACKEND_PORT=443
+      - PROTOCOL=https
+    networks:
+      - traefik
+    deploy:
+      replicas: 1
+      labels:
+        - "us.nixc.autodeploy=true"
+        - "traefik.enable=true"
+        - "traefik.http.routers.nginx-proxy.tls=true"
+        - "traefik.http.services.nginx-proxy.loadbalancer.server.port=80"
+        - "traefik.http.routers.nginx-proxy.rule=Host(`nginx-proxy.nixc.us`)"
+        - "traefik.http.routers.nginx-proxy.entrypoints=websecure"
+        - "traefik.http.routers.nginx-proxy.tls.certresolver=letsencryptresolver"
+        - "traefik.http.routers.nginx-proxy.service=nginx-proxy"
+        - "traefik.docker.network=traefik"
+#        - 'traefik.http.routers.nginx-proxy.middlewares=authelia_authelia@docker'
--- a/tests/nginx-proxy.nixc.us.test.ts
+++ b/tests/nginx-proxy.nixc.us.test.ts
@ -0,0 +1,6 @@
+import { test, expect } from '@playwright/test';
+
+test('test', async ({ page }) => {
+  await page.goto('https://nginx-proxy.nixc.us/secret-health-path');
+  await page.getByText('Healthy').click();
+});
--- a/truenas.yml
+++ b/truenas.yml
@ -1,96 +0,0 @@
-version: "3.9"
-
-networks:
-  traefik:
-    external: true
-
-services:
-  truenas:
-    image: codeberg.org/iridium-net/lan-to-nginx:truenas
-    environment:
-      - BACKEND_ADDRESS=192.168.8.47
-      - BACKEND_PORT=443
-      - PROTOCOL=https
-      - MATOMO_URL=//m.nixc.us/     # Replace with your actual Matomo URL if different.
-      - MATOMO_SITE_ID=1            # Replace with your actual Site ID if different.
-    networks:
-      - traefik
-    deploy:
-      replicas: 1
-      placement:
-        constraints:
-          - node.hostname == macmini7
-      labels:
-        - "us.nixc.autodeploy=true"
-        - "traefik.enable=true"
-        - "traefik.http.routers.truenas-truenas.tls=true"
-        - "traefik.http.services.truenas-truenas.loadbalancer.server.port=80"
-        - "traefik.http.routers.truenas-truenas.rule=Host(`truenas.nixc.us`)"
-        - "traefik.http.routers.truenas-truenas.entrypoints=websecure"
-        - "traefik.http.routers.truenas-truenas.tls.certresolver=letsencryptresolver"
-        - "traefik.http.routers.truenas-truenas.service=truenas-truenas"
-        - "traefik.docker.network=traefik"
-        - 'traefik.http.routers.truenas-truenas.middlewares=authelia_authelia@docker'
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "udp://log.nixc.us:15124"
-        tag: "truenas_truenas"
-  minio-api:
-    image: codeberg.org/iridium-net/lan-to-nginx:truenas
-    environment:
-      - BACKEND_ADDRESS=192.168.8.47
-      - BACKEND_PORT=9000
-      - PROTOCOL=http
-    networks:
-      - traefik
-    deploy:
-      replicas: 1
-      placement:
-        constraints:
-          - node.hostname == macmini7
-      labels:
-        - "us.nixc.autodeploy=true"
-        - "traefik.enable=true"
-        - "traefik.http.routers.truenas-minio-api.tls=true"
-        - "traefik.http.services.truenas-minio-api.loadbalancer.server.port=80"
-        - "traefik.http.routers.truenas-minio.rule=Host(`minio.nixc.us`)"
-        - "traefik.http.routers.truenas-minio.entrypoints=websecure"
-        - "traefik.http.routers.truenas-minio.tls.certresolver=letsencryptresolver"
-        - "traefik.http.routers.truenas-minio.service=truenas-minio"
-        - "traefik.docker.network=traefik"
-        # - 'traefik.http.routers.truenas-minio.middlewares=authelia_authelia@docker'
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "udp://log.nixc.us:15124"
-        tag: "truenas_minio"
-  minio-api:
-    image: codeberg.org/iridium-net/lan-to-nginx:truenas
-    environment:
-      - BACKEND_ADDRESS=192.168.8.47
-      - BACKEND_PORT=9002
-      - PROTOCOL=http
-    networks:
-      - traefik
-    deploy:
-      replicas: 1
-      placement:
-        constraints:
-          - node.hostname == macmini7
-      labels:
-        - "us.nixc.autodeploy=true"
-        - "traefik.enable=true"
-        - "traefik.http.routers.truenas-minio-api.tls=true"
-        - "traefik.http.services.truenas-minio-api.loadbalancer.server.port=80"
-        - "traefik.http.routers.truenas-minio-api.rule=Host(`minio-api.nixc.us`)"
-        - "traefik.http.routers.truenas-minio-api.entrypoints=websecure"
-        - "traefik.http.routers.truenas-minio-api.tls.certresolver=letsencryptresolver"
-        - "traefik.http.routers.truenas-minio-api.service=truenas-minio-api"
-        - "traefik.docker.network=traefik"
-        # - 'traefik.http.routers.truenas-minio-api.middlewares=authelia_authelia@docker'
-    logging:
-      driver: "gelf"
-      options:
-        gelf-address: "udp://log.nixc.us:15124"
-        tag: "truenas_minio-api"