diff --git a/provisioning/box/drutopiavm.rb b/provisioning/box/drutopiavm.rb index d9423d3..a12e94b 100644 --- a/provisioning/box/drutopiavm.rb +++ b/provisioning/box/drutopiavm.rb @@ -1,6 +1,6 @@ def set_overrides_per_project(config) # Acquire a hostname from the project root - project_dir_name = File.basename(ENV['DRUPALVM_PROJECT_ROOT']).gsub("_", "-") + project_dir_name = File.basename(ENV['DRUPALVM_PROJECT_ROOT']).gsub("_", "-").gsub(" ", "-") host_name = "#{project_dir_name}.test" # Override all vconfig values with the new names diff --git a/provisioning/box/post-tasks/10-drupal.yml b/provisioning/box/post-tasks/10-drupal.yml index c3625a7..a934b1d 100644 --- a/provisioning/box/post-tasks/10-drupal.yml +++ b/provisioning/box/post-tasks/10-drupal.yml @@ -1,27 +1,27 @@ --- -- name: determine status of settings location - stat: - path: "{{ drupal_core_path }}/sites/default" - register: stat_result +- name: determine status of settings directory and files + find: + paths: "{{ drupal_core_path }}/sites/default/" + recurse: no + register: find_result -- name: ensure settings location is writable +- name: ensure settings directory is writable file: path: "{{ drupal_core_path }}/sites/default" mode: 0775 state: directory - owner: vagrant - group: vagrant - when: stat_result.stat.exists == true and stat_result.stat.writeable == false + when: find_result.failed == false become: yes -- name: ensure settings file is still writable +- name: ensure setting files are writable file: - path: "{{ drupal_core_path }}/sites/default/settings.php" + path: "{{ setting_file.path }}" mode: 0664 state: file - owner: vagrant - group: vagrant - when: stat_result.stat.exists == true and stat_result.stat.writeable == false + when: find_result.failed == false + loop: "{{ find_result.files }}" + loop_control: + loop_var: setting_file become: yes - name: Run composer install. diff --git a/provisioning/box/pre-tasks/00-name_by_path.yml b/provisioning/box/pre-tasks/00-name_by_path.yml index b1b8cb1..628031a 100644 --- a/provisioning/box/pre-tasks/00-name_by_path.yml +++ b/provisioning/box/pre-tasks/00-name_by_path.yml @@ -7,9 +7,9 @@ delegate_to: localhost become: false -- name: remove underscores from folder name +- name: remove spaces and underscores from folder name set_fact: - proj_root_safe: "{{ proj_root.stdout|basename|replace('_','-') }}" + proj_root_safe: "{{ proj_root.stdout|basename|replace('_','-')|replace(' ','-') }}" # These values are NOT honored by Vagrant, but are still necessary for DrupalVM # See also provisioning/box/config