badges: configure secrets.ini

Signed-off-by: Ryan Lerch <rlerch@redhat.com>

roles/openshift-apps/badges/templates/configmap.yml

@@ -19,6 +19,8 @@ items:
       {{ load_file('checkout-rules-repo.sh') | indent(6) }}
     tahrir.ini: |-
       {{ load_file('tahrir.ini') | indent(6) }}
+    secrets.ini: |-
+      {{ load_file('secrets.ini') | indent(6) }}
 - apiVersion: v1
   kind: ConfigMap
   metadata:

roles/openshift-apps/badges/templates/secrets.ini

@@ -0,0 +1,9 @@
+[tahrir]
+
+{% if env == 'staging' %}
+session.secret="{{tahrirstgSessionSecret}}"
+authnsecret="{{tahrirstgAuthnSecret}}"
+{% else %}
+session.secret="{{tahrirSessionSecret}}"
+authnsecret="{{tahrirAuthnSecret}}"
+{% endif %}

roles/openshift-apps/badges/templates/tahrir.ini

@@ -21,8 +21,7 @@ mako.directories=tahrir:templates
 
 tahrir.admin = nb@fedoraproject.org, siddharthvipul1@fedoraproject.org, sayanchowdhury@fedoraproject.org, kevin@fedoraproject.org, jflory7@fedoraproject.org, codeblock@fedoraproject.org, churchyard@fedoraproject.org, misc@fedoraproject.org, computerkid@fedoraproject.org, dustymabe@fedoraproject.org, gui1ty@fedoraproject.org, riecatnor@fedoraproject.org, smeragoel@fedoraproject.org, sumantrom@fedoraproject.org, ekidney@fedoraproject.org, t0xic0der@fedoraproject.org
 
-tahrir.pngs.uri = /usr/share/badges/pngs
-
+tahrir.pngs.uri = /tmp
 # disabled, trying to see if this fix this bug
 # https://pagure.io/fedora-infrastructure/issue/8689
 dogpile.cache.backend = dogpile.cache.null
@@ -47,6 +46,7 @@ tahrir.openid_identifier = http://id.fedoraproject.org/
 tahrir.trusted_openid = ^http(s)?:\/\/([a-zA-Z0-9-]+\.)?id\.fedoraproject\.org(/)?$
 tahrir.openid_realm = https://badges.fedoraproject.org
 tahrir.websocket.topic = org.fedoraproject.prod.fedbadges.badge.award
+tahrir.secret_config_path = /etc/badges/secrets.ini
 #fedmenu.url = https://apps.fedoraproject.org/fedmenu
 #fedmenu.data_url = https://apps.fedoraproject.org/js/data.js
 {% endif %}
@@ -73,15 +73,6 @@ tahrir.social.twitter_user_text = Check out all these #fedorabadges :trophy:
 tahrir.social.twitter_user_hash = #fedora
 tahrir.social.gplus = True
 
-
-{% if env == 'staging' %}
-session.secret="{{tahrirstgSessionSecret}}"
-authnsecret="{{tahrirstgAuthnSecret}}"
-{% else %}
-session.secret="{{tahrirSessionSecret}}"
-authnsecret="{{tahrirAuthnSecret}}"
-{% endif %}
-
 moksha.domain = fedoraproject.org
 
 moksha.notifications = False