From 9bba5c515c9b8eb0a44904ac802d0c8ae2e22f39 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Mon, 23 Mar 2020 14:30:20 +0100
Subject: [PATCH] Inlcude all the vars!

---
 ansible/pre-deploy.yml | 16 ++++++++++------
 ansible/vars/all.yml   | 13 +++++++++++--
 sbin/entrypoint.sh     |  5 +++++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml
index 9381eda..d38bce7 100644
--- a/ansible/pre-deploy.yml
+++ b/ansible/pre-deploy.yml
@@ -83,23 +83,27 @@
         app: gitea
         restart: false
         config:
-          APP_NAME: "{{ autonomic_app_name }}"
           ADMIN_MAIL: "{{ autonomic_admin_mail }}"
           ADMIN_PASS: "{{ autonomic_admin_pass }}"
           ADMIN_USER: "{{ autonomic_admin_user }}"
+          APP_NAME: "{{ autonomic_app_name }}"
+          AUTHOR: "{{ author }}"
           DB_HOST: "dokku-mariadb-gitea:3306"
           DB_NAME: "gitea"
           DB_PASSWD: "{{ db_passwd }}"
           DB_TYPE: "mysql"
           DB_USER: "mariadb" # https://github.com/dokku/dokku-mariadb/issues/89
-          DISABLE_REGISTRATION: "true"
+          DESCRIPTION: "{{ description }}"
+          DISABLE_REGISTRATION: "{{ disable_registration }}"
           DOKKU_LETSENCRYPT_EMAIL: "{{ autonomic_admin_mail }}"
-          DOMAIN: "git.autonomic.zone"
-          INSTALL_LOCK: "true"
+          DOMAIN: "{{ domain }}"
+          ENABLE_OPENID_SIGNIN: "{{ enable_openid_signin }}"
+          ENABLE_OPENID_SIGNUP: "{{ enable_openid_signup }}"
+          INSTALL_LOCK: "{{ install_lock }}"
           JWT_SECRET: "{{ jwt_secret }}"
           RUN_MODE: "prod"
           SECRET_KEY: "{{ secret_key}}"
+          STARTUP_TIMEOUT: "{{ startup_timeout }}"
           USER_GID: "{{ gitea_user_guid }}"
           USER_UID: "{{ gitea_user_uid }}"
-          ENABLE_OPENID_SIGNIN: "true"
-          ENABLE_OPENID_SIGNUP: "true"
+          WHITELIST_URIS: "{{ whitelist_uris }}"
diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml
index d430f80..b44f1da 100644
--- a/ansible/vars/all.yml
+++ b/ansible/vars/all.yml
@@ -1,4 +1,13 @@
 ---
+autonomic_admin_mail: "helo@autonomic.zone"
+autonomic_admin_user: "autonomic"
 autonomic_app_name: "Gitea: Git with solidaritea"
-autonomic_admin_mail: helo@autonomic.zone
-autonomic_admin_user: autonomic
+disable_registration: "true"
+domain: "git.autonomic.zone"
+enable_openid_signin: "true"
+enable_openid_signup: "true"
+install_lock: "true"
+whitelist_uris: "https://git.autonomic.zone"
+author: "{{ autonomic_app_name }}"
+description: "Git hosting for conrads"
+startup_timeout: "0"
diff --git a/sbin/entrypoint.sh b/sbin/entrypoint.sh
index cd38a66..240b2ff 100755
--- a/sbin/entrypoint.sh
+++ b/sbin/entrypoint.sh
@@ -47,6 +47,9 @@ setup_app_ini() {
     crudini --set "$app_ini" '' APP_NAME "${APP_NAME}"
     crudini --set "$app_ini" '' RUN_MODE "${RUN_MODE}"
 
+    crudini --set "$app_ini" ui.meta AUTHOR "${AUTHOR}"
+    crudini --set "$app_ini" ui.meta DESCRIPTION "${DESCRIPTION}"
+
     crudini --del "$app_ini" database PATH
     crudini --set "$app_ini" database DB_TYPE mysql
     crudini --set "$app_ini" database HOST "${DB_HOST}"
@@ -70,7 +73,9 @@ setup_app_ini() {
 
     crudini --set "$app_ini" openid ENABLE_OPENID_SIGNIN "${ENABLE_OPENID_SIGNIN}"
     crudini --set "$app_ini" openid ENABLE_OPENID_SIGNUP "${ENABLE_OPENID_SIGNUP}"
+    crudini --set "$app_ini" openid WHITELIST_URIS "${WHITELIST_URIS}"
 
+    crudini --set "$app_ini" indexer STARTUP_TIMEOUT "${STARTUP_TIMEOUT}"
 }
 
 main() {