diff --git a/.gitignore b/.gitignore index 202c6cc..e0ae71e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,10 @@ .DS_Store .idea -dcos_generate_config*.sh -exhibitor.properties .vagrant +exhibitor.properties dcos provision/jre-*-linux-x64.tgz -packer_cache -output-virtualbox-iso -*.box + +dcos_generate_config*.sh +/etc/config.yaml /VagrantConfig.yaml diff --git a/Vagrantfile b/Vagrantfile index 002e383..e6d3622 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -13,7 +13,7 @@ $user_config = { box_version: ENV.fetch("DCOS_BOX_VERSION", "~> 0.3"), vm_config_path: ENV.fetch("DCOS_VM_CONFIG_PATH", "VagrantConfig.yaml"), - config_path: ENV.fetch("DCOS_CONFIG_PATH", "etc/1_master-config-1.5.yaml"), + config_path: ENV.fetch("DCOS_CONFIG_PATH", "etc/config.yaml"), generate_config_path: ENV.fetch("DCOS_GENERATE_CONFIG_PATH", "dcos_generate_config.sh"), java_enabled: ENV.fetch("DCOS_JAVA_ENABLED", "false"), private_registry: ENV.fetch("DCOS_PRIVATE_REGISTRY", "false"),