# HG changeset patch # User ymh # Date 1394799370 -3600 # Node ID fa66f4bb15635e4b5866544bcfcbe3c089ea4ee0 # Parent dc75c8d65289d179bf73ef4a6be213f9ca2682fc add some more custom config and put every thing in comment in the custom.yaml template diff -r dc75c8d65289 -r fa66f4bb1563 dev/Vagrantfile --- a/dev/Vagrantfile Fri Mar 14 10:03:37 2014 +0100 +++ b/dev/Vagrantfile Fri Mar 14 13:16:10 2014 +0100 @@ -5,7 +5,7 @@ custom_file_path = File.join(__dir__, (ENV['SYSCONFIG'] || 'custom.yaml')) -context = File.exist?(custom_file_path)?YAML::load_file(custom_file_path):{} +context = (File.exist?(custom_file_path)?YAML::load_file(custom_file_path):{}) || {} ROOT_PATH = context.fetch("root_path","../") @@ -18,11 +18,11 @@ # please see the online documentation at vagrantup.com. # Every Vagrant virtual environment requires a box to build off of. - config.vm.box = "wheezy-73-x64" + config.vm.box = context.fetch("vm_box","wheezy-73-x64") # The url from where the 'config.vm.box' box will be fetched if it # doesn't already exist on the user's system. - config.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box" + config.vm.box_url = context.fetch("vm_box_url","http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box") # Create a forwarded port mapping which allows access to a specific port # within the machine from a port on the host machine. In the example below, diff -r dc75c8d65289 -r fa66f4bb1563 dev/custom.yaml.tmpl --- a/dev/custom.yaml.tmpl Fri Mar 14 10:03:37 2014 +0100 +++ b/dev/custom.yaml.tmpl Fri Mar 14 13:16:10 2014 +0100 @@ -1,22 +1,24 @@ --- -root_path : ../ -vm_ip : 172.16.1.2 -vm_name : coment_dev - -sysconfig::params::db_name : coment_custom -sysconfig::params::db_user : coment_user_cutom -sysconfig::params::db_pw : coment_pw_custom -sysconfig::params::db_host : 127.0.0.1_custom -sysconfig::params::db_port : 5433 +#root_path : ../ +#vm_box : wheezy-73-x64 +#vm_box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box +#vm_ip : 172.16.1.2 +#vm_name : coment_dev -sysconfig::params::testserver_port : 8001 +#sysconfig::params::db_name : coment_custom +#sysconfig::params::db_user : coment_user_cutom +#sysconfig::params::db_pw : coment_pw_custom +#sysconfig::params::db_host : 127.0.0.1_custom +#sysconfig::params::db_port : 5433 + +#sysconfig::params::testserver_port : 8001 -sysconfig::params::superuser_name : admin_custom -sysconfig::params::superuser_pw : dev@co-ment_custom -sysconfig::params::user_edit_name : user-edit -sysconfig::params::user_edit_pw : user-edit@co-ment -sysconfig::params::user_com_name : user-com -sysconfig::params::user_com_pw : user-com@co-ment -sysconfig::params::user_observ_name : user-observ -sysconfig::params::user_observ_pw : user-observ@co-ment +#sysconfig::params::superuser_name : admin_custom +#sysconfig::params::superuser_pw : dev@co-ment_custom +#sysconfig::params::user_edit_name : user-edit +#sysconfig::params::user_edit_pw : user-edit@co-ment +#sysconfig::params::user_com_name : user-com +#sysconfig::params::user_com_pw : user-com@co-ment +#sysconfig::params::user_observ_name : user-observ +#sysconfig::params::user_observ_pw : user-observ@co-ment