diff --git a/ansible/pre-deploy.yml b/ansible/pre-deploy.yml index 42eec4c..11d080a 100644 --- a/ansible/pre-deploy.yml +++ b/ansible/pre-deploy.yml @@ -110,6 +110,8 @@ RUN_MODE: "prod" SECRET_KEY: "{{ secret_key}}" SSH_DOMAIN: "{{ ssh_domain }}" + SSH_LISTEN_PORT: "{{ ssh_listen_port }}" + SSH_PORT: "{{ ssh_port }}" STARTUP_TIMEOUT: "{{ startup_timeout }}" USER_GID: "{{ git_user_guid }}" USER_UID: "{{ git_user_uid }}" diff --git a/ansible/vars/all.yml b/ansible/vars/all.yml index 9a82edb..71f5632 100644 --- a/ansible/vars/all.yml +++ b/ansible/vars/all.yml @@ -10,6 +10,8 @@ domain: "git.autonomic.zone" enable_openid_signin: "true" enable_openid_signup: "true" install_lock: "true" +ssh_domain: "git.autonomic.zone" +ssh_listen_port: "%(SSH_PORT)s" +ssh_port: "222" startup_timeout: "0" whitelist_uris: "https://git.autonomic.zone" -ssh_domain: "git.autonomic.zone" diff --git a/sbin/entrypoint.sh b/sbin/entrypoint.sh index 61edfb4..d1a7ab7 100755 --- a/sbin/entrypoint.sh +++ b/sbin/entrypoint.sh @@ -64,6 +64,8 @@ setup_app_ini() { crudini --set "$app_ini" server HTTP_ADDR "" crudini --set "$app_ini" server HTTP_PORT "3000" crudini --set "$app_ini" server SSH_DOMAIN "${SSH_DOMAIN}" + crudini --set "$app_ini" server SSH_PORT "${SSH_PORT}" + crudini --set "$app_ini" server SSH_LISTEN_PORT "${SSH_LISTEN_PORT}" crudini --set "$app_ini" service DISABLE_REGISTRATION "${DISABLE_REGISTRATION}" crudini --set "$app_ini" service ALLOW_ONLY_EXTERNAL_REGISTRATION "${ALLOW_ONLY_EXTERNAL_REGISTRATION}"