From 88597218731fef2649be1733891c363f07104c55 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Thu, 13 Jun 2019 17:52:56 +0200
Subject: [PATCH] Deploy framadate from crans gitlab
---
roles/framadate/defaults/main.yml | 8 --------
roles/framadate/tasks/main.yml | 12 ++++++------
services_web.yml | 10 +++++++++-
3 files changed, 15 insertions(+), 15 deletions(-)
delete mode 100644 roles/framadate/defaults/main.yml
diff --git a/roles/framadate/defaults/main.yml b/roles/framadate/defaults/main.yml
deleted file mode 100644
index fa2e321c..00000000
--- a/roles/framadate/defaults/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-# URL to clone
-service_repo: https://framagit.org/framasoft/framadate.git
-
-# name of the service user
-# It means that you will have to `sudo -u THISUSER zsh` to debug
-service_user: www-data
-service_path: /var/www/framadate
diff --git a/roles/framadate/tasks/main.yml b/roles/framadate/tasks/main.yml
index 3d0f64d8..282a9fa6 100644
--- a/roles/framadate/tasks/main.yml
+++ b/roles/framadate/tasks/main.yml
@@ -15,20 +15,20 @@
- name: Clone framadate project
git:
- repo: "{{ service_repo }}"
- dest: "{{ service_path }}"
- version: "{{ service_version }}"
+ repo: "{{ framadate_repo }}"
+ dest: "{{ framadate_path }}"
+ version: "{{ framadate_version }}"
- name: Set perms on framadate code
file:
- path: "{{ service_path }}"
+ path: "{{ framadate_path }}"
state: directory
- owner: "{{ service_user }}"
+ owner: "{{ framadate_user }}"
recurse: true
# composer install
# become: true
-# become_user: "{{ service_user }}"
+# become_user: "{{ framadate_user }}"
# cd framadate
# sudo -u www-data touch admin/stdout.log
diff --git a/services_web.yml b/services_web.yml
index 4d18feca..be69ece3 100644
--- a/services_web.yml
+++ b/services_web.yml
@@ -6,11 +6,19 @@
# Deploy FramaDate
- hosts: voyager.adm.crans.org
vars:
- service_version: 1.1.10
+ # mirror on Crans GitLab because adm has no network
+ framadate_repo: https://gitlab.crans.org/nounous/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
# Indicate service in motd
motd_role:
name: framadate
+ path: "{{ framadate_path }}"
roles:
- framadate
- motd-role
--
GitLab