From 5dc0a7cdcbfe75ec5c405ba4087bde7934ea144d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Mon, 11 Nov 2013 15:01:12 +0000
Subject: [PATCH] add in copr config passwords from private variables

---
 files/copr/copr-be.conf                             | 2 +-
 playbooks/hosts/copr-be.cloud.fedoraproject.org.yml | 6 +++++-
 playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml | 7 +++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/files/copr/copr-be.conf b/files/copr/copr-be.conf
index 55f4614dd0..db1a65ab4a 100644
--- a/files/copr/copr-be.conf
+++ b/files/copr/copr-be.conf
@@ -10,7 +10,7 @@ frontend_url=http://copr-fe.cloud.fedoraproject.org/backend
 
 # must have same value as BACKEND_PASSWORD from have frontend in /etc/copr/copr.conf
 # default is PASSWORDHERE but you really should change it. really.
-frontend_auth=PASSWORDHERE
+frontend_auth={{ copr_backend_password }}
 
 # path to ansible playbook which spawns builder
 # see /usr/share/copr*/playbooks/ for examples
diff --git a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml
index 0a62b76ee3..80ee05aa6e 100644
--- a/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/copr-be.cloud.fedoraproject.org.yml
@@ -150,7 +150,11 @@
     - provision_config
 
   - name: copy copr-be.conf
-    action: copy src=$files/copr/copr-be.conf-dev dest=/etc/copr/copr-be.conf
+    template: src=$files/copr/copr-be.conf dest=/etc/copr/copr-be.conf  mode=640
+    notify:
+    - restart copr-backend
+    tags:
+    - config
 
   - name: fedmsg certs
     copy: >
diff --git a/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml b/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml
index 26aad7e718..6a77d82760 100644
--- a/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml
+++ b/playbooks/hosts/copr-fe.cloud.fedoraproject.org.yml
@@ -44,6 +44,13 @@
     tags:
     - packages
 
+  - name: install copr configs
+    template: src=$files/copr/copr.conf dest=/etc/copr/copr.conf mode=600
+    notify:
+    - restart httpd
+    tags:
+    - config
+
   - name: copy apache files to conf.d
     action: copy src=$files/copr/fe/httpd/$item dest=/etc/httpd/conf.d/$item
     with_items: