From 9f72090d4bb51bfeaa4c7e23aa4b179d247a89a4 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 23 Feb 2016 16:12:20 +0100
Subject: [PATCH] General improvements
---
meta/main.yml | 1 +
tasks/install.gitscript.yml | 21 +++++++++++++++------
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/meta/main.yml b/meta/main.yml
index ae3495e..a465569 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -2,6 +2,7 @@
dependencies:
- { role: apache }
+ - { role: php, php_called_from_apache: false }
- { role: letsencrypt }
- { role: mysql, when: ignore_these_tasks is defined }
- { role: jailkit, when: jailkit is defined }
diff --git a/tasks/install.gitscript.yml b/tasks/install.gitscript.yml
index 976a3b8..9db7227 100644
--- a/tasks/install.gitscript.yml
+++ b/tasks/install.gitscript.yml
@@ -1,14 +1,23 @@
---
# file: roles/drupal/tasks/install.gitscript.yml
+- name: "Ensure Repository Directory"
+ file:
+ path='{{ webRoot }}{{ drupal.src.git.target }}'
+ state='directory'
+ owner='root'
+ group='root'
+ mode='775'
+
- name: "Clone Git Repository"
git:
- accept_hostkey: "yes"
- repo: "{{ drupal.src.git.repository }}"
- dest: "{{ webRoot }}{{ drupal.src.git.target }}"
- force: "yes"
- version: "{{ drupal.src.git.branch|default(omit) }}"
+ accept_hostkey: yes
+ repo: '{{ drupal.src.git.repository }}'
+ dest: '{{ webRoot }}{{ drupal.src.git.target }}'
+ force: yes
+ version: '{{ drupal.src.git.branch|default(omit) }}'
become: false
- name: "Run Script"
- shell: "{{ webRoot }}{{ drupal.src.git.target }}{{ drupal.src.script }}"
+ shell: '{{ webRoot }}{{ drupal.src.git.target }}{{ drupal.src.script }}'
+ when: drupal.src.script
--
GitLab