From 6f568997d2b46a92d35bf5e752f625ad80f882b8 Mon Sep 17 00:00:00 2001 From: Jeremy Balch Date: Wed, 4 Jun 2014 11:25:05 -0400 Subject: [PATCH] revert .gitignore that ignored Vagrantfile adding Vagrantfile to .gitignore caused cloned repos to lose the contents of the vagrantfile instead showing a symlink to a nonexistent path outside the repo. --- .gitignore | 1 - Vagrantfile | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 120 insertions(+), 2 deletions(-) mode change 120000 => 100644 Vagrantfile diff --git a/.gitignore b/.gitignore index 0a6e54c..6136c5c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,5 @@ .DS_Store .vagrant -Vagrantfile puppet/modules/* !puppet/modules/*.md !puppet/modules/phpmyadmin/ diff --git a/Vagrantfile b/Vagrantfile deleted file mode 120000 index f141079..0000000 --- a/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -/Users/boblivion/DevDocs/vagrantfiles/Vagrantfile.resold \ No newline at end of file diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..8ecf982 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,120 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +myCustomHostname = "fc.fatcatchdesign.dev" +mySyncedFolder = "~/Sites/#{myCustomHostname}/htdocs" + +Vagrant.configure("2") do |config| + # All Vagrant configuration is done here. The most common configuration + # options are documented and commented below. For a complete reference, + # please see the online documentation at vagrantup.com. + + # Every Vagrant virtual environment requires a box to build off of. + config.vm.box = "puppetlabs-centos64nocm" + + # 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/centos-64-x64-vbox4210-nocm.box" + + # Custom hostname + config.vm.hostname = myCustomHostname + + # Create a private network, which allows host-only access to the machine + # using a specific IP. + config.vm.network :private_network, ip: "192.168.33.10" + + # 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, + # accessing "localhost:8080" will access port 80 on the guest machine. + config.vm.network :forwarded_port, host: 8888, guest: 80 + + # Create a public network, which generally matched to bridged network. + # Bridged networks make the machine appear as another physical device on + # your network. + # config.vm.network :public_network + + # Provider-specific configuration so you can fine-tune various + # backing providers for Vagrant. These expose provider-specific options. + # Example for VirtualBox: + # + config.vm.provider :virtualbox do |vb| + # # Don't boot with headless mode + # vb.gui = true + # + # # Use VBoxManage to customize the VM. For example to change memory: + vb.customize ["modifyvm", :id, "--memory", "512"] + vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"] + end + + # Share an additional folder to the guest VM. The first argument is + # the path on the host to the actual folder. The second argument is + # the path on the guest to mount the folder. And the optional third + # argument is a set of non-required options. + config.vm.synced_folder mySyncedFolder, "/var/www/htdocs" #, :id => "vagrant-www", :owner => "vagrant", :group => "apache", :extra => 'dmode=770,fmode=664' + + # Enable shell provisioning to bootstrap puppet + config.vm.provision :shell, :path => "bootstrap.sh" + + # Enable provisioning with Puppet stand alone. Puppet manifests + # are contained in a directory path relative to this Vagrantfile. + # You will need to create the manifests directory and a manifest in + # the file base.pp in the manifests_path directory. + # + # An example Puppet manifest to provision the message of the day: + # + # # group { "puppet": + # # ensure => "present", + # # } + # # + # # File { owner => 0, group => 0, mode => 0644 } + # # + # # file { '/etc/motd': + # # content => "Welcome to your Vagrant-built virtual machine! + # # Managed by Puppet.\n" + # # } + # + config.vm.provision :puppet do |puppet| + puppet.manifests_path = "puppet/manifests" + puppet.manifest_file = "site.pp" + puppet.module_path = "puppet/modules" + # puppet.options = "--hiera_config /vagrant/hiera.yaml --verbose --debug" + end + + # Enable provisioning with chef solo, specifying a cookbooks path, roles + # path, and data_bags path (all relative to this Vagrantfile), and adding + # some recipes and/or roles. + # + # config.vm.provision :chef_solo do |chef| + # chef.cookbooks_path = "../my-recipes/cookbooks" + # chef.roles_path = "../my-recipes/roles" + # chef.data_bags_path = "../my-recipes/data_bags" + # chef.add_recipe "mysql" + # chef.add_role "web" + # + # # You may also specify custom JSON attributes: + # chef.json = { :mysql_password => "foo" } + # end + + # Enable provisioning with chef server, specifying the chef server URL, + # and the path to the validation key (relative to this Vagrantfile). + # + # The Opscode Platform uses HTTPS. Substitute your organization for + # ORGNAME in the URL and validation key. + # + # If you have your own Chef Server, use the appropriate URL, which may be + # HTTP instead of HTTPS depending on your configuration. Also change the + # validation key to validation.pem. + # + # config.vm.provision :chef_client do |chef| + # chef.chef_server_url = "https://api.opscode.com/organizations/ORGNAME" + # chef.validation_key_path = "ORGNAME-validator.pem" + # end + # + # If you're using the Opscode platform, your validator client is + # ORGNAME-validator, replacing ORGNAME with your organization name. + # + # If you have your own Chef Server, the default validation client name is + # chef-validator, unless you changed the configuration. + # + # chef.validation_client_name = "ORGNAME-validator" +end