From a391d85161682d48b70ca3a807920d8416d41098 Mon Sep 17 00:00:00 2001
From: Patrick Uiterwijk <patrick@puiterwijk.org>
Date: Fri, 10 May 2019 21:16:40 +0200
Subject: [PATCH] fas: add all config files

Signed-off-by: Patrick Uiterwijk <patrick@puiterwijk.org>
---
 roles/fas_server/templates/configmap.yml        | 17 +++++++++++++++++
 .../fas/templates/buildconfig-fas.yml           | 13 +++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/roles/fas_server/templates/configmap.yml b/roles/fas_server/templates/configmap.yml
index 707d7e0172..d8f2a4d8e0 100644
--- a/roles/fas_server/templates/configmap.yml
+++ b/roles/fas_server/templates/configmap.yml
@@ -77,3 +77,20 @@ data:
     TypesConfig /etc/mime.types
     AddDefaultCharset UTF-8
     CoreDumpDirectory /tmp
+
+    # FAS stuff
+    {{ load_file('fas-app.conf.j2') | indent() }}
+  fas_sync_keytab: |-
+    {{ lookup('file', '{{ private }}/files/keytabs/{{env}}/fas_sync') | indent() }}
+  fas_sync_cert.pem: |-
+    {{ lookup('file', '{{ roles_path }}/fas_server/files/ipa.{{env}}.pem') | indent() }}
+  fas-log.cfg: |-
+    {{ lookup('file', '{{ roles_path }}/fas_server/files/fas-log.cfg') | indent() }}
+  pubring.gpg: |-
+    {{ lookup('file', '{{ private }}/files/fas-gpg/pubring.gpg') | indent() }}
+  fas.cfg: |-
+    {{ load_file('fas.cfg.j2') | indent() }}
+  export-bugzilla.cfg: |-
+    {{ load_file('export-bugzilla.cfg.j2') | indent() }}
+  export-bugzilla: |-
+    {{ lookup('file', '{{ roles_path }}/fas_server/files/export-bugzilla') | indent() }}
diff --git a/roles/openshift-apps/fas/templates/buildconfig-fas.yml b/roles/openshift-apps/fas/templates/buildconfig-fas.yml
index 28059457c7..ce7bc4d82c 100644
--- a/roles/openshift-apps/fas/templates/buildconfig-fas.yml
+++ b/roles/openshift-apps/fas/templates/buildconfig-fas.yml
@@ -27,8 +27,17 @@ spec:
           httpd \
           mod_wsgi
 
-      # Set up krb5
-      RUN rm -f /etc/krb5.conf && ln -sf /etc/fas/krb5.conf /etc/krb5.conf
+      # Set up config symlinks
+      RUN rm -f /etc/krb5.conf && \
+        rm -f /etc/fas-gpg/pubring.gpg && \
+        rm -f /etc/fas.cfg && \
+        rm -f /usr/sbin/export-bugzilla && \
+        rm -f /usr/lib/python2.6/site-packages/fas/config/log.cfg && \
+        ln -sf /etc/fas/krb5.conf /etc/krb5.conf && \
+        ln -sf /etc/fas/pubring.gpg /etc/fas-gpg/pubring.gpg &&\
+        ln -sf /etc/fas/fas.cfg /etc/fas.cfg && \
+        ln -sf /etc/fas/fas-log.cfg /usr/lib/python2.6/site-packages/fas/config/log.cfg && \
+        ln -sf /etc/fas/fas_sync_keytab /etc/fas_sync_keytab
 
       EXPOSE 8080
       ENTRYPOINT bash /etc/fas/start.sh