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 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 diff --git a/Vagrantfile b/Vagrantfile index 17c83445..535491df 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" @@ -21,5 +26,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| puppet.manifest_file = "base.pp" #puppet.options = "--verbose --debug" end - end diff --git a/ember-app/package.json b/ember-app/package.json index 7a994609..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": "pwd && ../node_modules/.bin/bower install" + "postinstall": "node ../node_modules/bower/bin/bower install" }, "repository": "", "engines": { 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" + }