Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean Vagrant+Windows Install #201

Merged
merged 8 commits into from
Mar 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* text=auto
1 change: 1 addition & 0 deletions .librarian/.gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* eol=lf
3 changes: 3 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -494,3 +494,6 @@ DEPENDENCIES
uglifier (>= 1.3.0)
warden-github
wkhtmltopdf-heroku

BUNDLED WITH
1.11.2
6 changes: 5 additions & 1 deletion Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -21,5 +26,4 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
puppet.manifest_file = "base.pp"
#puppet.options = "--verbose --debug"
end

end
2 changes: 1 addition & 1 deletion ember-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wasn't aware that npm on windows and npm on unix differed in this convention.

This might not work for a heroku deployment

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does, as far as I can tell: https://huboard-rails-pr-201.herokuapp.com/

},
"repository": "",
"engines": {
Expand Down
6 changes: 6 additions & 0 deletions puppet/manifests/base.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets pair together on moving this to puppet, its probably best to keep our provisioning unified.

Better?

}