diff --git a/Vagrantfile b/Vagrantfile index 2b57e92..a02398c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -18,8 +18,6 @@ default_config = "provisioning/ansible/config/default.config.yml" if !File.exist # Default vagrant config. vconfig = YAML::load_file(default_config) -vconfig['beet_home'] = '/beetbox' -vconfig['beet_base'] = '/var/beetbox' vconfig['beet_domain'] = beet_root.split('/').last.gsub(/[\._]/, '-') + ".local" # Create config directory. diff --git a/provisioning/ansible/config/default.config.yml b/provisioning/ansible/config/default.config.yml index 97a59ef..f3de0a8 100644 --- a/provisioning/ansible/config/default.config.yml +++ b/provisioning/ansible/config/default.config.yml @@ -17,7 +17,7 @@ vagrant_cpus: 1 beet_profile: beetbox beet_repo: "{{ lookup('env','BEET_REPO') | default('https://github.com/beetboxvm/beetbox.git',true) }}" beet_version: "{{ lookup('env','BEET_VERSION') | default('master',true) }}" -beet_home: "{{ lookup('env','BEET_HOME') | default('/beetbox',true) }}" +beet_home: "/beetbox" beet_role_dir: "{{ beet_home }}/provisioning/ansible/roles" beet_project: drupal beet_debug: no @@ -26,7 +26,7 @@ beet_aliases: [] beet_env_name: BB_ENVIRONMENT beet_env: vagrant beet_user: "{{ lookup('env','BEET_USER') | default('vagrant',true) }}" -beet_base: "{{ lookup('env','BEET_BASE') | default('/var/beetbox',true) }}" +beet_base: "/var/beetbox" beet_root: "{{ beet_base }}" beet_web: "{{ beet_root }}" beet_ssh_home: "{{ beet_root }}"