From 8b6ca864d6fb35ba3bbb724e67274ec75672836b Mon Sep 17 00:00:00 2001
From: shirenn <shirenn@crans.org>
Date: Tue, 2 Jun 2020 22:06:16 +0200
Subject: [PATCH] [framadate] on prie

---
 roles/framadate/tasks/main.yml          | 13 +++++++------
 roles/framadate/templates/nginx-site.j2 |  4 ++--
 services_web.yml                        |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/roles/framadate/tasks/main.yml b/roles/framadate/tasks/main.yml
index 263740d3..d452631d 100644
--- a/roles/framadate/tasks/main.yml
+++ b/roles/framadate/tasks/main.yml
@@ -78,21 +78,22 @@
     state: link
   notify: restart nginx
 
-- name: Indicate role in motd
-  template:
-    src: update-motd.d/05-service.j2
-    dest: /etc/update-motd.d/05-framadate
-    mode: 0755
-
 - name: Create the database
   mysql_db:
+    login_unix_socket: /var/run/mysqld/mysqld.sock
     name: framadate
     state: present
 
 - name: Grant access right to framadate
   mysql_user:
+    login_unix_socket: /var/run/mysqld/mysqld.sock
     name: framadate
     password: "{{ db_password }}"
     priv: 'framadate.*:ALL'
     state: present
 
+- name: Indicate role in motd
+  template:
+    src: update-motd.d/05-service.j2
+    dest: /etc/update-motd.d/05-framadate
+    mode: 0755
diff --git a/roles/framadate/templates/nginx-site.j2 b/roles/framadate/templates/nginx-site.j2
index ef963c3e..de485e81 100644
--- a/roles/framadate/templates/nginx-site.j2
+++ b/roles/framadate/templates/nginx-site.j2
@@ -34,7 +34,7 @@ server {
             include /etc/nginx/fastcgi_params;
             fastcgi_pass unix:/run/php/php7.3-fpm.sock;
         }
-        try_files $uri $uri/ =401; 
+        try_files $uri $uri/ =401;
     }
 
     location / {
@@ -47,7 +47,7 @@ server {
         rewrite "^/([a-zA-Z0-9]{24})/admin$" "/adminstuds.php?poll=$1" last;
         rewrite "^/([a-zA-Z0-9]{24})/admin/vote/([a-zA-Z0-9]{16})$" "/adminstuds.php?poll=$1&vote=$2" last;
         rewrite "^/([a-zA-Z0-9]{24})/admin/action/([a-zA-Z_-]+)(/([A-Za-z0-9]+))?$" "/adminstuds.php?poll=$1&$2=$4" last;
-        try_files $uri /index.php; 
+        try_files $uri /index.php;
     }
 
     location ~ \.php$ {
diff --git a/services_web.yml b/services_web.yml
index 29752237..0da726c3 100755
--- a/services_web.yml
+++ b/services_web.yml
@@ -9,7 +9,7 @@
   vars:
     framadate:
       repo: https://framagit.org/framasoft/framadate/framadate.git
-      version: "77bf2aaa0c344fd25535e2d0543d9a76bf35b5fd"
+      version: "e8747ffef6f64372785dd9da7c18c20112eba9bf"
       path: /var/www/framadate
       admin_username: framadate
       admin_password: "{{ vault_framadate_password }}"