Fix setup-http-site-forward: set correct port for IPv6 SSL vhost

inventory

@@ -67,7 +67,13 @@ all:
         36633532393231663634663034666666356332373438646130643161383134653739663066626538
         3661663132343639310a613431653031626434323064313465373866666332353931313836623465
         3461
-
     pottwal.n39.eu:
       server_admin: "admin+pottwal@netz39.de"
+      shlink_geolite_license_key: !vault |
+        $ANSIBLE_VAULT;1.1;AES256
+        33626234393039623132663736656363356562383235353737313034613630626339303263366665
+        6133333035663566356532303131373066646632363233330a333230376231616461343262623138
+        31356239323439666632333033616366663762646366343839663463633665333863343437343334
+        3665386538393066380a383366346235343531306561643534663035646537666534383536333230
+        34613761363237633865306332653631323366343232353666343165666664343838
 

pottwal.yml

@@ -8,13 +8,16 @@
     mosquitto_image: eclipse-mosquitto:1.6
     mosquitto_data: /srv/data/mosquitto
 
-    openhab_image: openhab/openhab:2.5.11
+    openhab_image: openhab/openhab:3.1.0
     openhab_data: /srv/data/openhab
     openhab_host_port: 8081
     openhab_configuration_source: https://github.com/netz39/n39-openhab.git
     openhab_configuration_version: master
 
     uritools_host_port: 8080
+    entities_validation_svc_host_port: 8082
+    shlink_host_port: 8083
+    shlink_domain_name: sl.n39.eu
 
   roles:
     - role: docker_setup
@@ -129,6 +132,46 @@
         site_name: uritools.n39.eu
         proxy_port: "{{ uritools_host_port }}"
 
+    - name: Ensure container for entities validation service is running
+      docker_container:
+        name: entities_validation_svc
+        image: netz39/entities_validation_svc:v1.0.0
+        pull: true
+        state: started
+        detach: yes
+        ports:
+          - "{{ entities_validation_svc_host_port }}:8080"
+        restart_policy: unless-stopped
+
+    - name: Setup proxy site entities-validation.svc.n39.eu
+      include_role:
+        name: setup-http-site-proxy
+      vars:
+        site_name: entities-validation.svc.n39.eu
+        proxy_port: "{{ entities_validation_svc_host_port }}"
+
+    - name: Ensure container for shlink is running
+      docker_container:
+        name: shlink
+        image: shlinkio/shlink:2.6.2
+        pull: true
+        state: started
+        detach: yes
+        ports:
+          - "{{ shlink_host_port }}:8080"
+        restart_policy: unless-stopped
+        env:
+          SHORT_DOMAIN_HOST: "{{ shlink_domain_name }}"
+          SHORT_DOMAIN_SCHEMA: https
+          GEOLITE_LICENSE_KEY: "{{ shlink_geolite_license_key }}"
+
+    - name: Setup proxy site {{ shlink_domain_name }}
+      include_role:
+        name: setup-http-site-proxy
+      vars:
+        site_name: "{{ shlink_domain_name }}"
+        proxy_port: "{{ shlink_host_port }}"    
+    
   handlers:
     - name: restart mosquitto
       docker_container:

roles/setup-http-site-forward/templates/apache-docker-forward-site.j2

@@ -15,7 +15,7 @@
 </VirtualHost>
 
 <IfFile /usr/local/etc/dehydrated/certs/{{ site_name }}>
-<VirtualHost {{ ansible_default_ipv4.address }}:443 [{{ ansible_default_ipv6.address }}]:80>
+<VirtualHost {{ ansible_default_ipv4.address }}:443 [{{ ansible_default_ipv6.address }}]:443>
     ServerAdmin {{ server_admin }}
     ServerName {{ site_name }}
     ServerAlias {{ site_name }}

tau.yml

@@ -37,7 +37,7 @@
         name: setup-http-site-forward
       vars:
         site_name: reservierung.netz39.de
-        forward_to: https://codimd.pingtech.de/aYsBj5wSTviFTozd8b0P_Q
+        forward_to: https://codimd.pingtech.de/rQqQ5kv2Rhmxs8S6anVSjg
 
     - name: Setup proxy site testredmine.netz39.de
       include_role:
@@ -68,10 +68,3 @@
       vars:
         site_name: mysql.adm.netz39.de
         proxy_port: 9001
-
-    - name: Setup forward site wiki.netz39.de
-      include_role:
-        name: setup-http-site-forward
-      vars:
-        site_name: wiki.netz39.de
-        forward_to: https://netz39.de/wiki