Skip to content
Snippets Groups Projects
Commit 2c2a8a0f authored by jurgenhaas's avatar jurgenhaas
Browse files

Fix a bug so that first installation always executes

parent fa6d8d04
No related branches found
No related tags found
No related merge requests found
......@@ -18,7 +18,7 @@
force: yes
version: '{{ drupal.src.git.branch|default(omit) }}'
become: false
when: not drupal.src.git.bare|default(false)
when: drupal_first_installation or not drupal.src.git.bare|default(false)
- name: "Second Clone Git Repository"
git:
......@@ -26,7 +26,7 @@
dest: '{{ webRoot }}{{ drupal.src.git.target2 }}'
force: yes
version: '{{ drupal.src.git.branch|default(omit) }}'
when: drupal.src.git.target2 is defined and not drupal.src.git.bare|default(false)
when: drupal.src.git.target2 is defined and (drupal_first_installation or not drupal.src.git.bare|default(false))
- name: "Run Script"
shell: '{{ webRoot }}{{ drupal.src.git.target }}{{ drupal.src.script }}'
......
......@@ -48,11 +48,15 @@
register: drupal_available
failed_when: false
- include: install/{{ installSource.mode|default("none") }}.yml
- set_fact: drupal_first_installation=false
- set_fact: drupal_first_installation=true
when: drupal_install_drupal and drupal_available is defined and drupal_available.stdout != '{{ drupalRoot }}/index.php'
- include: install/{{ installSource.mode|default("none") }}.yml
when: drupal_first_installation
- include: install/{{ drupal.version|default("d7") }}.yml
when: drupal_install_drupal and drupal_available is defined and drupal_available.stdout != '{{ drupalRoot }}/index.php'
when: drupal_first_installation
- include: deploy/{{ installSource.mode|default("none") }}.yml
when: drupal_install_drupal
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment