From 65876c4d0d60804b1a62cb495c357deaacad3d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= Date: Tue, 11 Jun 2019 16:30:51 +0200 Subject: [PATCH] fpdc: separate config files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Konečný --- .../openshift-apps/fpdc/templates/config.json | 21 +++++++++++++++++ .../fpdc/templates/configmap.yml | 23 ++----------------- 2 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 roles/openshift-apps/fpdc/templates/config.json diff --git a/roles/openshift-apps/fpdc/templates/config.json b/roles/openshift-apps/fpdc/templates/config.json new file mode 100644 index 0000000000..bf63794866 --- /dev/null +++ b/roles/openshift-apps/fpdc/templates/config.json @@ -0,0 +1,21 @@ +{ + "COREAPI_URL": "https://fpdc{{ env_suffix }}.fedoraproject.org", + "OIDC_OP_JWKS_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Jwks", + "OIDC_OP_AUTHORIZATION_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Authorization", + "OIDC_OP_TOKEN_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Token", + "OIDC_OP_USER_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/UserInfo", + "DIST_GIT_URL": "https://src{{ env_suffix }}.fedoraproject.org/{namespace}/{name}", +{% if env == 'staging' %} + "SECRET_KEY": "{{ stg_fpdc_secret_key }}", + "DB_PASSWORD": "{{ fpdc_stg_db_pass }}", + "DB_HOST": "{{ fpdc_stg_db_server }}", + "OIDC_RP_CLIENT_ID": "{{ fpdc_stg_client_id }}", + "OIDC_RP_CLIENT_SECRET": "{{ fpdc_stg_client_secret }}" +{% else %} + "SECRET_KEY": "{{ fpdc_secret_key }}", + "DB_PASSWORD": "{{ fpdc_db_pass }}", + "DB_HOST": "{{ fpdc_db_server }}", + "OIDC_RP_CLIENT_ID": "{{ fpdc_client_id }}", + "OIDC_RP_CLIENT_SECRET": "{{ fpdc_client_secret }}" +{% endif %} +} diff --git a/roles/openshift-apps/fpdc/templates/configmap.yml b/roles/openshift-apps/fpdc/templates/configmap.yml index 0680d2d88e..7c0d7e8eef 100644 --- a/roles/openshift-apps/fpdc/templates/configmap.yml +++ b/roles/openshift-apps/fpdc/templates/configmap.yml @@ -1,3 +1,4 @@ +{% macro load_file(filename) %}{% include filename %}{%- endmacro -%} --- apiVersion: v1 kind: ConfigMap @@ -7,24 +8,4 @@ metadata: app: fpdc data: config.json: |- - { - "COREAPI_URL": "https://fpdc{{ env_suffix }}.fedoraproject.org", - "OIDC_OP_JWKS_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Jwks", - "OIDC_OP_AUTHORIZATION_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Authorization", - "OIDC_OP_TOKEN_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/Token", - "OIDC_OP_USER_ENDPOINT": "https://id{{ env_suffix }}.fedoraproject.org/openidc/UserInfo", - "DIST_GIT_URL": "https://src{{ env_suffix }}.fedoraproject.org/{namespace}/{name}", -{% if env == 'staging' %} - "SECRET_KEY": "{{ stg_fpdc_secret_key }}", - "DB_PASSWORD": "{{ fpdc_stg_db_pass }}", - "DB_HOST": "{{ fpdc_stg_db_server }}", - "OIDC_RP_CLIENT_ID": "{{ fpdc_stg_client_id }}", - "OIDC_RP_CLIENT_SECRET": "{{ fpdc_stg_client_secret }}" -{% else %} - "SECRET_KEY": "{{ fpdc_secret_key }}", - "DB_PASSWORD": "{{ fpdc_db_pass }}", - "DB_HOST": "{{ fpdc_db_server }}", - "OIDC_RP_CLIENT_ID": "{{ fpdc_client_id }}", - "OIDC_RP_CLIENT_SECRET": "{{ fpdc_client_secret }}" -{% endif %} - } + {{ load_file('config.json') | indent }}