diff --git a/meta/main.yml b/meta/main.yml index ae3495ef6ed78e8dd35fd3ae38f6afa59322ded6..a465569e12a806887e8f3b76be248d6a7b1055bb 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 976a3b84d3cedf4bb586071da23d9979dad421c5..9db7227bc8ce5712d832cad4ec08e9bffaaaa6c4 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