Permalink
Browse files

Upgrading to precise64 and fixing some typos.

  • Loading branch information...
1 parent abe922b commit e715af7f49c43f221cd7937b0ad597ca75aa91fc @iandees iandees committed May 4, 2013
Showing with 7 additions and 10 deletions.
  1. +2 −2 Vagrantfile
  2. +2 −5 manifests/base.pp
  3. +1 −1 manifests/osm_database.sh
  4. +2 −2 seed.sh
View
@@ -3,8 +3,8 @@
Vagrant::Config.run do |config|
- config.vm.box = "maverick64"
- config.vm.box_url = "https://s3.amazonaws.com/osmdevbox/maverick64.box"
+ config.vm.box = "precise64"
+ config.vm.box_url = "http://files.vagrantup.com/precise64.box"
config.vm.customize [
View
@@ -13,9 +13,6 @@
managehome => true,
}
-Exec["/usr/bin/apt-get update -y"] -> Package <| |>
-Exec["/usr/bin/apt-get upgrade -y"] -> Package <| |>
-
exec { "/usr/bin/apt-get update -y":
user => "root",
timeout => 3600,
@@ -71,7 +68,7 @@
ensure => installed,
}
-package { "libmagick9-dev":
+package { "graphicsmagick-libmagick-dev-compat":
ensure => installed,
}
@@ -235,4 +232,4 @@
creates => "/home/vagrant/osm_directories_setup.log",
logoutput => "true",
require => [ Exec["rake_migrate"] ]
-}
+}
@@ -5,7 +5,7 @@ createuser openstreetmap -s
createdb -E UTF8 -O openstreetmap openstreetmap -T template0
createdb -E UTF8 -O openstreetmap osm_test -T template0
createdb -E UTF8 -O openstreetmap osm -T template0
-psql -d openstreetmap < /usr/share/postgresql/8.4/contrib/btree_gist.sql
+echo "create extension btree_gist;" | psql
echo "alter role openstreetmap password 'openstreetmap'" | psql
View
@@ -1,7 +1,7 @@
#!/bin/sh
# bootstrap
-sudo apt-get install git-core ruby -y
+sudo apt-get -y install git-core ruby
git clone https://github.com/tlpinney/osmdevbox.git
git clone https://github.com/puppetlabs/puppet.git
wget http://files.rubyforge.vm.bytemark.co.uk/rubygems/rubygems-1.3.7.tgz
@@ -14,5 +14,5 @@ sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
# sudo apt-get install puppet -y
# run puppet scripts
-sudo uppet apply -v osmdevbox/manifests/base.pp
+sudo puppet apply -v osmdevbox/manifests/base.pp

0 comments on commit e715af7

Please sign in to comment.