From 41629ae2766e94497ddf47d313c4a3e3626a8e69 Mon Sep 17 00:00:00 2001
From: Emmanuel Cazenave <ecazenave@entrouvert.com>
Date: Wed, 28 Nov 2018 19:24:58 +0100
Subject: [PATCH] allow external theme installation (#28146)

---
 roles/base/defaults/main.yml |  2 ++
 roles/base/tasks/main.yml    | 38 ++++++------------------------------
 roles/facts/tasks/main.yml   |  4 ++++
 tasks/install_theme.yml      | 33 +++++++++++++++++++++++++++++++
 4 files changed, 45 insertions(+), 32 deletions(-)
 create mode 100644 roles/base/defaults/main.yml
 create mode 100644 tasks/install_theme.yml

diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml
new file mode 100644
index 0000000..6e3e81c
--- /dev/null
+++ b/roles/base/defaults/main.yml
@@ -0,0 +1,2 @@
+theme_repo: "publik-base-theme"
+theme_link: "publik-base"
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index eea4178..30af837 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -71,38 +71,12 @@
     repo: "eopayment"
     repo_dir: "{{ src_dir }}/eopayment"
 
-- name: ssh git clone publik-base-theme
-  git:
-    repo: ssh://git@git.entrouvert.org/publik-base-theme.git
-    dest: "{{ src_dir }}/publik-base-theme"
-  when:
-    - git_ssh
-    - clone_repo
-
-- name: standard git clone publik-base-theme
-  git:
-    repo: https://repos.entrouvert.org/publik-base-theme.git
-    dest: "{{ src_dir }}/publik-base-theme"
-  when:
-    - not git_ssh
-    - clone_repo
-
-- name: make publik-base-theme
-  make:
-    chdir: "{{ src_dir }}/publik-base-theme"
-    target: all
-  when: compile_theme
-
-- name: create themes directory
-  file:
-    path: "{{venv}}/themes"
-    state: directory
-
-- name: link to publik-base-theme
-  file:
-    src: "{{ src_dir }}/publik-base-theme"
-    path: "{{themes_dir}}/publik-base"
-    state: link
+- name: install theme
+  import_tasks: tasks/install_theme.yml
+  vars:
+    src_theme_dir: "{{src_dir}}/{{theme_repo}}"
+  tags:
+    - theme
 
 - name: create cert directory
   file:
diff --git a/roles/facts/tasks/main.yml b/roles/facts/tasks/main.yml
index 4f4a91c..cdee505 100644
--- a/roles/facts/tasks/main.yml
+++ b/roles/facts/tasks/main.yml
@@ -3,8 +3,12 @@
   local_action: command whoami
   when: user == 'your_user_name'
   register: username
+  tags:
+    - theme
 
 - name: set user variable
   set_fact:
     user: "{{ username.stdout }}"
   when: user == 'your_user_name'
+  tags:
+    - theme
diff --git a/tasks/install_theme.yml b/tasks/install_theme.yml
new file mode 100644
index 0000000..e259bd2
--- /dev/null
+++ b/tasks/install_theme.yml
@@ -0,0 +1,33 @@
+
+- name: ssh git clone {{theme_repo}}
+  git:
+    repo: ssh://git@git.entrouvert.org/{{theme_repo}}.git
+    dest: "{{src_theme_dir}}"
+  when:
+    - git_ssh
+    - clone_repo
+
+- name: standard git clone {{theme_repo}}
+  git:
+    repo: https://repos.entrouvert.org/{{theme_repo}}.git
+    dest: "{{src_theme_dir}}"
+  when:
+    - not git_ssh
+    - clone_repo
+
+- name: compile theme {{theme_repo}}
+  make:
+    chdir: "{{src_theme_dir}}"
+    target: all
+  when: compile_theme
+
+- name: create themes directory
+  file:
+    path: "{{themes_dir}}"
+    state: directory
+
+- name: link to {{theme_repo}}
+  file:
+    src: "{{src_theme_dir}}"
+    path: "{{themes_dir}}/{{theme_link}}"
+    state: link
-- 
2.19.2