From bcba080057d86874a1740939a02bc17c71b80bcb Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Fri, 1 May 2020 18:37:51 +0200
Subject: [PATCH] Clean up Framadate for shireen

---
 roles/framadate/tasks/main.yml                     | 14 +++++++-------
 .../templates/update-motd.d/05-service.j2          |  3 +--
 services_web.yml                                   | 12 ++++--------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/roles/framadate/tasks/main.yml b/roles/framadate/tasks/main.yml
index b3584f62..02c698e7 100644
--- a/roles/framadate/tasks/main.yml
+++ b/roles/framadate/tasks/main.yml
@@ -16,23 +16,23 @@
 
 - name: Clone framadate project
   git:
-    repo: "{{ framadate_repo }}"
-    dest: "{{ framadate_path }}"
-    version: "{{ framadate_version }}"
+    repo: "{{ framadate.repo }}"
+    dest: "{{ framadate.path }}"
+    version: "{{ framadate.version }}"
 
 - name: Set perms on framadate code
   file:
-    path: "{{ framadate_path }}"
+    path: "{{ framadate.path }}"
     state: directory
-    owner: "{{ framadate_user }}"
+    owner: www-data
     recurse: true
 
 - name: Install Framadate dependencies
   composer:
     command: install
-    working_dir: "{{ framadate_path }}"
+    working_dir: "{{ framadate.path }}"
   become: true
-  become_user: "{{ framadate_user }}"
+  become_user: www-data
   register: composer_result
   retries: 3
   until: composer_result is succeeded
diff --git a/roles/framadate/templates/update-motd.d/05-service.j2 b/roles/framadate/templates/update-motd.d/05-service.j2
index bf029cde..d0598362 100755
--- a/roles/framadate/templates/update-motd.d/05-service.j2
+++ b/roles/framadate/templates/update-motd.d/05-service.j2
@@ -1,4 +1,3 @@
 #!/usr/bin/tail +14
 {{ ansible_header | comment }}
-> framadate a été déployé sur cette machine.
-  Voir {{ framadate_path }}
+> Framadate a été déployé sur cette machine. Voir {{ framadate.path }}.
diff --git a/services_web.yml b/services_web.yml
index e52e8a23..17515e3f 100755
--- a/services_web.yml
+++ b/services_web.yml
@@ -7,14 +7,10 @@
 # Deploy FramaDate
 - hosts: voyager.adm.crans.org
   vars:
-    # mirror on Crans GitLab because adm has no network
-    framadate_repo: https://framagit.org/framasoft/framadate/framadate.git
-    framadate_version: 1.1.10
-
-    # User who will run framadate
-    # you will have to `sudo -u THISUSER zsh` to debug
-    framadate_user: www-data
-    framadate_path: /var/www/framadate
+    framadate:
+      repo: https://framagit.org/framasoft/framadate/framadate.git
+      version: 1.1.10
+      path: /var/www/framadate
   roles:
     - framadate