Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Move ODCS kerberos configuration from koji conf to odcs conf.

Browse source
This commit is contained in:
Jan Kaluža 2017-12-11 10:43:38 +00:00
parent a496d0ab42
commit 524b07800a
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
roles/odcs/backend/templates/etc/koji.conf.d/odcs.conf.j2
View file

@ -4,8 +4,6 @@ weburl = https://koji.fedoraproject.org/koji
topurl = https://kojipkgs.fedoraproject.org/ topurl = https://kojipkgs.fedoraproject.org/
authtype = kerberos authtype = kerberos
krb_rdns = false krb_rdns = false
principal = odcs/odcs.fedoraproject.org@FEDORAPROJECT.ORG
keytab = /etc/krb5.odcs_odcs{{env_suffix}}.fedoraproject.org.keytab
[stg] [stg]
server = https://koji.stg.fedoraproject.org/kojihub server = https://koji.stg.fedoraproject.org/kojihub
@ -13,6 +11,4 @@ weburl = https://koji.stg.fedoraproject.org/koji
topurl = https://kojipkgs.stg.fedoraproject.org/ topurl = https://kojipkgs.stg.fedoraproject.org/
authtype = kerberos authtype = kerberos
krb_rdns = false krb_rdns = false
principal = odcs/odcs.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG
keytab = /etc/krb5.odcs_odcs{{env_suffix}}.fedoraproject.org.keytab

8
roles/odcs/base/templates/etc/odcs/config.py.j2
View file

@ -75,6 +75,9 @@ class ProdConfiguration(BaseConfiguration):
KOJI_PROFILE = 'stg' KOJI_PROFILE = 'stg'
PDC_URL = 'https://pdc.stg.fedoraproject.org/rest_api/v1' PDC_URL = 'https://pdc.stg.fedoraproject.org/rest_api/v1'
KRB_PRINCIPAL = odcs/odcs.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG
{% else %} {% else %}
AUTH_OPENIDC_USERINFO_URI = 'https://id.fedoraproject.org/openidc/UserInfo' AUTH_OPENIDC_USERINFO_URI = 'https://id.fedoraproject.org/openidc/UserInfo'
SECRET_KEY = "{{ odcs_prod_secret_key }}" SECRET_KEY = "{{ odcs_prod_secret_key }}"
@ -84,10 +87,15 @@ class ProdConfiguration(BaseConfiguration):
KOJI_PROFILE = 'production' KOJI_PROFILE = 'production'
PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1' PDC_URL = 'https://pdc.fedoraproject.org/rest_api/v1'
KRB_PRINCIPAL = odcs/odcs.stg.fedoraproject.org@STG.FEDORAPROJECT.ORG
{% endif %} {% endif %}
PDC_INSECURE = {{ odcs_pdc_insecure }} PDC_INSECURE = {{ odcs_pdc_insecure }}
PDC_DEVELOP = {{ odcs_pdc_develop }} PDC_DEVELOP = {{ odcs_pdc_develop }}
KRB_KEYTAB = /etc/krb5.odcs_odcs{{env_suffix}}.fedoraproject.org.keytab
KRB_CCACHE = None
TARGET_DIR = "{{ odcs_target_dir }}" TARGET_DIR = "{{ odcs_target_dir }}"
TARGET_DIR_URL = "{{ odcs_target_dir_url }}" TARGET_DIR_URL = "{{ odcs_target_dir_url }}"