From 95df6625dea947532200e3c81195befd5cad8921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Wed, 27 Jul 2016 09:51:08 +0000
Subject: [PATCH] Fix the Plus Plus Service role

---
 roles/plus-plus-service/handlers/main.yml            |  3 +++
 roles/plus-plus-service/tasks/main.yml               | 12 +++++++-----
 .../templates/{pps.conf => apache.conf}              |  0
 .../templates/{pps.cfg => settings.py}               |  0
 4 files changed, 10 insertions(+), 5 deletions(-)
 create mode 100644 roles/plus-plus-service/handlers/main.yml
 rename roles/plus-plus-service/templates/{pps.conf => apache.conf} (100%)
 rename roles/plus-plus-service/templates/{pps.cfg => settings.py} (100%)

diff --git a/roles/plus-plus-service/handlers/main.yml b/roles/plus-plus-service/handlers/main.yml
new file mode 100644
index 0000000000..fba23f58e9
--- /dev/null
+++ b/roles/plus-plus-service/handlers/main.yml
@@ -0,0 +1,3 @@
+---
+- name: reload httpd
+  service: name=httpd state=reloaded
diff --git a/roles/plus-plus-service/tasks/main.yml b/roles/plus-plus-service/tasks/main.yml
index 567b31f415..eb0323df2b 100644
--- a/roles/plus-plus-service/tasks/main.yml
+++ b/roles/plus-plus-service/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-# Configuration for the mdapi webapp
+# Configuration for the plus-plus-service webapp
 
 - name: Ensure mod_wsgi is not installed since we're using python3
   dnf: pkg=mod_wsgi state=absent
@@ -23,14 +23,16 @@
   - config
 
 - name: Install the config files
-  template: src={{ item.file }}
-            dest={{ item.location }}/{{ item.file }}
+  template: src={{ item.src }}
+            dest={{ item.dest }}
   with_items:
-  - { file: 'settings.py', location: /etc/plus-plus-service }
-  - { file: 'apache.conf', location: /etc/plus-plus-service }
+  - { src: 'settings.py', dest: /etc/plus-plus-service/settings.py }
+  - { src: 'apache.conf', dest: /etc/httpd/conf.d/plus-plus-service.conf }
   tags:
   - pps
   - config
+  notify:
+  - reload httpd
 
 - name: start apache service
   service: name=httpd enabled=yes state=running
diff --git a/roles/plus-plus-service/templates/pps.conf b/roles/plus-plus-service/templates/apache.conf
similarity index 100%
rename from roles/plus-plus-service/templates/pps.conf
rename to roles/plus-plus-service/templates/apache.conf
diff --git a/roles/plus-plus-service/templates/pps.cfg b/roles/plus-plus-service/templates/settings.py
similarity index 100%
rename from roles/plus-plus-service/templates/pps.cfg
rename to roles/plus-plus-service/templates/settings.py