From 4df4796e42fc9b8efd7e9d026f3c45d340993046 Mon Sep 17 00:00:00 2001
From: Ryan Lerch <rlerch@redhat.com>
Date: Thu, 4 Apr 2024 15:07:16 +1000
Subject: [PATCH] badges: put secrets ini path config in correct place

Signed-off-by: Ryan Lerch <rlerch@redhat.com>
---
 roles/openshift-apps/badges/files/service.yml    |  3 ++-
 roles/openshift-apps/badges/templates/tahrir.ini | 12 +++---------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/roles/openshift-apps/badges/files/service.yml b/roles/openshift-apps/badges/files/service.yml
index 39e63487b7..2df027887f 100644
--- a/roles/openshift-apps/badges/files/service.yml
+++ b/roles/openshift-apps/badges/files/service.yml
@@ -5,11 +5,12 @@ metadata:
   name: frontend
   labels:
     app: badges
+    service: web
+  namespace: badges
 spec:
   ports:
     - name: web
       port: 8080
       targetPort: 8080
   selector:
-    app: badges
     deploymentconfig: frontend
diff --git a/roles/openshift-apps/badges/templates/tahrir.ini b/roles/openshift-apps/badges/templates/tahrir.ini
index 2a39646541..44690fee2a 100644
--- a/roles/openshift-apps/badges/templates/tahrir.ini
+++ b/roles/openshift-apps/badges/templates/tahrir.ini
@@ -46,10 +46,12 @@ 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 %}
+
+tahrir.secret_config_path = /etc/badges/secrets.ini
+
 tahrir.secure_cookies = True
 tahrir.httponly_cookies = True
 tahrir.allow_changenick = False
@@ -73,14 +75,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