From 82c8d9135ee4fa9d765ada4abd7d2e2f07a61dfd Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sun, 7 Feb 2016 20:19:12 -0600 Subject: [PATCH 1/8] Add .gitattributes to enforce normalization on Windows --- .gitattributes | 1 + .librarian/.gitattributes | 1 + 2 files changed, 2 insertions(+) create mode 100644 .gitattributes create mode 100644 .librarian/.gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..176a458f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto diff --git a/.librarian/.gitattributes b/.librarian/.gitattributes new file mode 100644 index 00000000..fae8897c --- /dev/null +++ b/.librarian/.gitattributes @@ -0,0 +1 @@ +* eol=lf From 7fedf95965277ae36ae674290de49551109cc93c Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Mon, 8 Feb 2016 09:48:59 -0600 Subject: [PATCH 2/8] Remove debugging pwd from postinstall --- ember-app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ember-app/package.json b/ember-app/package.json index 7a994609..963c5768 100644 --- a/ember-app/package.json +++ b/ember-app/package.json @@ -11,7 +11,7 @@ "start": "ember server", "build": "ember build", "test": "ember test", - "postinstall": "pwd && ../node_modules/.bin/bower install" + "postinstall": "../node_modules/.bin/bower install" }, "repository": "", "engines": { From ab89074b2ac1bf843409e257817c23854bee5a7e Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Mon, 8 Feb 2016 13:13:30 -0600 Subject: [PATCH 3/8] Fix postinstall on Windows --- ember-app/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ember-app/package.json b/ember-app/package.json index 963c5768..8f282664 100644 --- a/ember-app/package.json +++ b/ember-app/package.json @@ -11,7 +11,7 @@ "start": "ember server", "build": "ember build", "test": "ember test", - "postinstall": "../node_modules/.bin/bower install" + "postinstall": "node ../node_modules/bower/bin/bower install" }, "repository": "", "engines": { From b739f12ad96dae9c4dfe72eeb6abf3a442f0062e Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Mon, 8 Feb 2016 18:35:11 -0600 Subject: [PATCH 4/8] Auto-cd /srv/huboard --- Vagrantfile | 1 + provision.sh | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 provision.sh diff --git a/Vagrantfile b/Vagrantfile index 17c83445..15eb3f23 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,6 +10,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box_version = "= 1.0.1" config.vm.synced_folder ".", "/srv/huboard", type: "nfs" + config.vm.provision "shell", path: "provision.sh" config.vm.network "private_network", ip: "192.168.50.10" config.vm.network "forwarded_port", guest: 3000, host: 3001 diff --git a/provision.sh b/provision.sh new file mode 100644 index 00000000..d896ba29 --- /dev/null +++ b/provision.sh @@ -0,0 +1,2 @@ +# Switch to /srv/huboard on login +echo "cd /srv/huboard" >> /home/vagrant/.bashrc From 078bee6926fd241f6bb39b3ffa9d856fce606087 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Wed, 17 Feb 2016 21:20:19 -0600 Subject: [PATCH 5/8] Execute provision.sh last --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 15eb3f23..5135aa52 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -10,7 +10,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box_version = "= 1.0.1" config.vm.synced_folder ".", "/srv/huboard", type: "nfs" - config.vm.provision "shell", path: "provision.sh" config.vm.network "private_network", ip: "192.168.50.10" config.vm.network "forwarded_port", guest: 3000, host: 3001 @@ -23,4 +22,5 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| #puppet.options = "--verbose --debug" end + config.vm.provision "shell", path: "provision.sh" end From 03ad1239696d17b9aeced0c6b29c69ad400d4156 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Wed, 17 Feb 2016 22:01:22 -0600 Subject: [PATCH 6/8] Add commented VirtualBox debugging tip --- Vagrantfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Vagrantfile b/Vagrantfile index 5135aa52..e04ec8a8 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -9,6 +9,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| config.vm.box = "puppetlabs/ubuntu-14.04-64-puppet" config.vm.box_version = "= 1.0.1" + config.vm.provider :virtualbox do |vb| + # Uncomment to assist with debugging: + # vb.gui = true + end + config.vm.synced_folder ".", "/srv/huboard", type: "nfs" config.vm.network "private_network", ip: "192.168.50.10" From e5682d3dc1eabc3ba16a324fa1cde30298051d7e Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Thu, 25 Feb 2016 22:17:35 -0500 Subject: [PATCH 7/8] BUNDLED WITH 1.11.2 --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 2de943aa..d0dc845f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -494,3 +494,6 @@ DEPENDENCIES uglifier (>= 1.3.0) warden-github wkhtmltopdf-heroku + +BUNDLED WITH + 1.11.2 From 2cc6cfd94ea2c552486fb875cbaf2b9e60842952 Mon Sep 17 00:00:00 2001 From: Keith Dahlby Date: Sat, 27 Feb 2016 13:34:13 -0600 Subject: [PATCH 8/8] Use Puppet exec instead of separate provision.sh --- Vagrantfile | 2 -- provision.sh | 2 -- puppet/manifests/base.pp | 6 ++++++ 3 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 provision.sh diff --git a/Vagrantfile b/Vagrantfile index e04ec8a8..535491df 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -26,6 +26,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| puppet.manifest_file = "base.pp" #puppet.options = "--verbose --debug" end - - config.vm.provision "shell", path: "provision.sh" end diff --git a/provision.sh b/provision.sh deleted file mode 100644 index d896ba29..00000000 --- a/provision.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Switch to /srv/huboard on login -echo "cd /srv/huboard" >> /home/vagrant/.bashrc diff --git a/puppet/manifests/base.pp b/puppet/manifests/base.pp index 0d879066..5fee4ee2 100644 --- a/puppet/manifests/base.pp +++ b/puppet/manifests/base.pp @@ -97,3 +97,9 @@ createdb => true, createrole => true, } + + exec { "echo 'cd /srv/huboard' >> .bashrc": + cwd => "/home/vagrant", + path => "/usr/bin:/usr/sbin:/bin", + unless => "grep -q '^cd /srv/huboard$' .bashrc" + }