feat: a lots of stuff and bugfixes mostly

templates/config.cuyper-hook.j2

@@ -0,0 +1,28 @@
+---
+
+dns:
+  clientId: {{ cuyper__dns_clientId }}
+  accessToken: {{ cuyper__dns_accessToken }}
+  type: {{ cuyper__dns_type }}
+  name: {{ cuyper__dns_name }}
+  domain: {{ cuyper__dns_domain }}
+
+gateway: {{ cuyper__gateway_hostname }}
+
+portainer:
+  hostName: "{{ cuyper__gateway_hostname }}"
+  url: "{{ cuyper__portainer_url }}"
+  user: "{{ cuyper__portainer_user }}"
+  password: "{{ cuyper__portainer_password }}"
+  endPointId: {{ cuyper__portainer_endPointId }}
+
+smtp:
+  hostName: {{ cuyper__smtp_hostName }}
+  port: {{ cuyper__smtp_port }}
+  user: {{ cuyper__smtp_user }}
+  pass: {{ cuyper__smtp_pass }}
+  from: {{ cuyper__smtp_from }}
+
+apikey: {{ cuyper__apikey }}
+
+knownzones: {{ cuyper__knownzones }}

templates/docker-compose.cuyper-hook.j2

@@ -2,16 +2,29 @@ services:
   loadbalancer:
     build: cuyper-hook/
     restart: always
+    env_file: .env
     ports:
       - "80:80"
       - "443:443"
     volumes:
       - "{{ cuyper__cuyper_storage_path }}/letsencrypt:/etc/letsencrypt"
-      - "{{ cuyper__cuyper_storage_path }}/nginx:/etc/nginx/conf.d/"
+      - "{{ cuyper__cuyper_config_path }}/nginx:/etc/nginx/conf.d/"
+      - "{{ cuyper__cuyper_config_path }}:/config"
     networks:
       loadbalance-network:
       internal_network:
 
+  portainer:
+    image: portainer/portainer-ce:2.45.1
+    restart: always
+    volumes:
+      - "{{ cuyper__portainer_storage_path }}:/data"
+      - "{{ cuyper__portainer_docker_sock }}:/var/run/docker.sock"
+    networks:
+      internal_network:
+        aliases:
+          - portainer
+          
 networks:
   loadbalance-network:
     external: true

templates/env.cuyper-hook.j2

@@ -1,2 +1,3 @@
-CONFIG_FILE={{ cuyper__config_file }}
-VHOSTS_FILE={{ cuyper__vhosts_file }}
+CONFIG_FILE=/config/config.yml
+VHOSTS_FILE=/config/vhosts.yml
+TEMPLATE_PATH=/app/templates

templates/nginx-hooks-ssl.conf.j2

@@ -0,0 +1,42 @@
+server {
+    listen 80;
+    listen [::]:80;
+
+    server_name {{ cuyper__dns_domain }};
+
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+    
+    http2 on;
+
+    server_name {{ cuyper__dns_domain }};
+
+    ssl_certificate     /etc/letsencrypt/live/{{ cuyper__dns_domain }}/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/{{ cuyper__dns_domain }}/privkey.pem;
+
+    server_name {{ cuyper__dns_domain }};
+    access_log /var/log/nginx/{{ cuyper__dns_domain }}.access.log;
+    error_log /var/log/nginx/{{ cuyper__dns_domain }}.error.log;
+
+    location /hooks/ {
+      proxy_pass http://localhost:3000/;
+      proxy_set_header Host $http_host;
+      proxy_http_version 1.1;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header X-Real-IP $remote_addr;
+    }
+
+    location /portainer/ {
+      proxy_pass http://portainer:9000/;
+      proxy_set_header Host $http_host;
+      proxy_http_version 1.1;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $scheme;
+      proxy_set_header X-Real-IP $remote_addr;
+    }
+}

templates/nginx-hooks.conf.j2

@@ -2,9 +2,9 @@ server {
     listen [::]:80;
     listen 80;
 
-    server_name {{ cuyper__hostname }};
-    access_log /var/log/nginx/{{ cuyper__hostname }}.access.log;
-    error_log /var/log/nginx/{{ cuyper__hostname }}.error.log;
+    server_name {{ cuyper__dns_domain }};
+    access_log /var/log/nginx/{{ cuyper__dns_domain }}.access.log;
+    error_log /var/log/nginx/{{ cuyper__dns_domain }}.error.log;
 
     client_max_body_size 128M;