vlad now uses vlad_local_settings.yml settings files instead of local…

…_settings.yml
hashbangcode · Aug 25, 2015 · 9498b92 · 9498b92
1 parent 49e047a
commit 9498b92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,10 +49,9 @@ settings
 vagrant_ansible_inventory_vlad
 vlad_guts/ansible.log
 vlad_guts/host.ini
-vlad_guts/local_settings.yml
 vlad_guts/merged_user_settings.yml
-vlad_guts/settings.yml
 vlad_guts/vlad_settings.yml
+vlad_guts/vlad_local_settings.yml
 
 # Default & common shared web root folder names
 docroot/*

diff --git a/Vagrantfile b/Vagrantfile
@@ -39,7 +39,7 @@ settings_files = {
                           grandparent_dir + "/settings/vlad_settings.yml"
                         ],
   "local overrides" => [
-                          vagrant_dir + "/vlad_guts/local_settings.yml",
+                          vagrant_dir + "/vlad_guts/vlad_local_settings.yml",
                           vagrant_dir + "/settings/vlad_local_settings.yml",
                           parent_dir + "/settings/vlad_local_settings.yml",
                           grandparent_dir + "/settings/vlad_local_settings.yml"