Fix vars handling

deploy.d/config.yml

@@ -2,6 +2,7 @@
 vars:
   port: "3020"
   domain: "git.autonomic.zone"
+  ssh_listen_post: "2222"
 
 volumes:
   - type: directory
@@ -42,11 +43,11 @@ env:
   DESCRIPTION: "Git hosting for conrads"
   DISABLE_REGISTRATION: "false"
   DOKKU_LETSENCRYPT_EMAIL: "helo@autonomic.zone"
-  DOMAIN: "{{ vars.domain }}"
+  DOMAIN: "{{ config.vars.domain }}"
   ENABLE_OPENID_SIGNIN: "true"
   ENABLE_OPENID_SIGNUP: "true"
   GITEA_THEME: "arc-green"
-  HTTP_PORT: "{{ vars.port }}"
+  HTTP_PORT: "{{ config.vars.port }}"
   INSTALL_LOCK: "true"
   JWT_SECRET: "{{ vault.jwt_secret }}"
   MAILER_ENABLED: "true"
@@ -58,8 +59,8 @@ env:
   SMTP_PASSWD: "{{ vault.smtp_passwd }}"
   SMTP_TLS_ENABLED: "true"
   SMTP_USER: "gitea-autonomic@decentral1.se"
-  SSH_DOMAIN: "{{ vars.domain }}"
-  SSH_LISTEN_PORT: "2222"
+  SSH_DOMAIN: "{{ config.vars.domain }}"
+  SSH_LISTEN_PORT: "{{ config.vars.ssh_listen_post }}"
   SSH_PORT: "222"
   STARTUP_TIMEOUT: "0"
-  WHITELIST_URIS: "https://{{ vars.domain }}"
+  WHITELIST_URIS: "https://{{ config.vars.domain }}"

deploy.d/plays/postdeploy.yml

@@ -20,7 +20,6 @@
 - name: Setup the SSH system -> container passthrough script
   become: true
   vars:
-    ssh_listen_port: "{{ config.vars.ssh_listen_port }}"
     dokku_container_ip: "{{ dokku_ps_inspect.stdout }}"
   template:
     src: "{{ app_config_root }}/templates/gitea.j2"

deploy.d/templates/gitea.j2

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ssh \
-  -p {{ ssh_listen_port }} \
+  -p {{ config.vars.ssh_listen_port }} \
   -o StrictHostKeyChecking=no \
   git@{{ dokku_container_ip }} \
   "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@"