Inlcude all the vars!

This commit is contained in:
Luke Murphy 2020-03-23 14:30:20 +01:00
parent 5a0d2310ad
commit 9bba5c515c
No known key found for this signature in database
GPG Key ID: 5E2EF5A63E3718CC
3 changed files with 26 additions and 8 deletions

View File

@ -83,23 +83,27 @@
app: gitea app: gitea
restart: false restart: false
config: config:
APP_NAME: "{{ autonomic_app_name }}"
ADMIN_MAIL: "{{ autonomic_admin_mail }}" ADMIN_MAIL: "{{ autonomic_admin_mail }}"
ADMIN_PASS: "{{ autonomic_admin_pass }}" ADMIN_PASS: "{{ autonomic_admin_pass }}"
ADMIN_USER: "{{ autonomic_admin_user }}" ADMIN_USER: "{{ autonomic_admin_user }}"
APP_NAME: "{{ autonomic_app_name }}"
AUTHOR: "{{ author }}"
DB_HOST: "dokku-mariadb-gitea:3306" DB_HOST: "dokku-mariadb-gitea:3306"
DB_NAME: "gitea" DB_NAME: "gitea"
DB_PASSWD: "{{ db_passwd }}" DB_PASSWD: "{{ db_passwd }}"
DB_TYPE: "mysql" DB_TYPE: "mysql"
DB_USER: "mariadb" # https://github.com/dokku/dokku-mariadb/issues/89 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 }}" DOKKU_LETSENCRYPT_EMAIL: "{{ autonomic_admin_mail }}"
DOMAIN: "git.autonomic.zone" DOMAIN: "{{ domain }}"
INSTALL_LOCK: "true" ENABLE_OPENID_SIGNIN: "{{ enable_openid_signin }}"
ENABLE_OPENID_SIGNUP: "{{ enable_openid_signup }}"
INSTALL_LOCK: "{{ install_lock }}"
JWT_SECRET: "{{ jwt_secret }}" JWT_SECRET: "{{ jwt_secret }}"
RUN_MODE: "prod" RUN_MODE: "prod"
SECRET_KEY: "{{ secret_key}}" SECRET_KEY: "{{ secret_key}}"
STARTUP_TIMEOUT: "{{ startup_timeout }}"
USER_GID: "{{ gitea_user_guid }}" USER_GID: "{{ gitea_user_guid }}"
USER_UID: "{{ gitea_user_uid }}" USER_UID: "{{ gitea_user_uid }}"
ENABLE_OPENID_SIGNIN: "true" WHITELIST_URIS: "{{ whitelist_uris }}"
ENABLE_OPENID_SIGNUP: "true"

View File

@ -1,4 +1,13 @@
--- ---
autonomic_admin_mail: "helo@autonomic.zone"
autonomic_admin_user: "autonomic"
autonomic_app_name: "Gitea: Git with solidaritea" autonomic_app_name: "Gitea: Git with solidaritea"
autonomic_admin_mail: helo@autonomic.zone disable_registration: "true"
autonomic_admin_user: autonomic 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"

View File

@ -47,6 +47,9 @@ setup_app_ini() {
crudini --set "$app_ini" '' APP_NAME "${APP_NAME}" crudini --set "$app_ini" '' APP_NAME "${APP_NAME}"
crudini --set "$app_ini" '' RUN_MODE "${RUN_MODE}" 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 --del "$app_ini" database PATH
crudini --set "$app_ini" database DB_TYPE mysql crudini --set "$app_ini" database DB_TYPE mysql
crudini --set "$app_ini" database HOST "${DB_HOST}" 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_SIGNIN "${ENABLE_OPENID_SIGNIN}"
crudini --set "$app_ini" openid ENABLE_OPENID_SIGNUP "${ENABLE_OPENID_SIGNUP}" 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() { main() {