From 898ceebce9f82ae8e422eaa007d654e11b647ef3 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Sat, 11 Apr 2020 13:11:22 +0200
Subject: [PATCH] Fix owncloud role

---
 roles/owncloud/handlers/main.yml           | 5 +++++
 roles/owncloud/tasks/main.yml              | 9 ++++++++-
 roles/owncloud/templates/nginx/owncloud.j2 | 4 ++--
 services_web.yml                           | 5 +++++
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 roles/owncloud/handlers/main.yml

diff --git a/roles/owncloud/handlers/main.yml b/roles/owncloud/handlers/main.yml
new file mode 100644
index 00000000..2e593d34
--- /dev/null
+++ b/roles/owncloud/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+- name: Restart nginx
+  service:
+    name: nginx
+    state: restarted
diff --git a/roles/owncloud/tasks/main.yml b/roles/owncloud/tasks/main.yml
index 9c97d047..9b9aacd0 100644
--- a/roles/owncloud/tasks/main.yml
+++ b/roles/owncloud/tasks/main.yml
@@ -8,7 +8,6 @@
   register: apt_key_result
   retries: 3
   until: apt_key_result is succeeded
-  loop:
 
 # Add the repository into source list
 - name: Configure owncloud repository
@@ -30,6 +29,14 @@
   template:
     src: nginx/owncloud.j2
     dest: /etc/nginx/sites-available/owncloud
+  notify: Restart nginx
+
+- name: Activate NGINX site
+  file:
+    src: /etc/nginx/sites-available/owncloud
+    dest: /etc/nginx/sites-enabled/owncloud
+    state: link
+  notify: Restart nginx
 
 - name: Indicate role in motd
   template:
diff --git a/roles/owncloud/templates/nginx/owncloud.j2 b/roles/owncloud/templates/nginx/owncloud.j2
index 63bf3bce..cb19043d 100644
--- a/roles/owncloud/templates/nginx/owncloud.j2
+++ b/roles/owncloud/templates/nginx/owncloud.j2
@@ -1,12 +1,12 @@
 # {{ ansible_managed }}
 
 upstream php-handler {
-    server unix:/var/run/php/php7.0-fpm.sock;
+    server unix:/var/run/php/php7.3-fpm.sock;
 }
 
 server {
     listen owncloud.adm.crans.org:80;
-    server_name owncloud.crans.org owncloud.adm.example.com;
+    server_name owncloud.crans.org;
 
     # Add headers to serve security related headers
     # Before enabling Strict-Transport-Security headers please read into this topic first.
diff --git a/services_web.yml b/services_web.yml
index 71f9b9f3..23cc4a4c 100755
--- a/services_web.yml
+++ b/services_web.yml
@@ -33,6 +33,11 @@
   roles:
     - mumudvb
 
+# Deploy OwnCloud
+- hosts: owncloud-srv.adm.crans.org
+  roles:
+    - owncloud
+
 # Mirrors
 - hosts: charybde.adm.crans.org
   vars: