Skip to content

Commit

Permalink
Upgrading to precise64 and fixing some typos.
Browse files Browse the repository at this point in the history
  • Loading branch information
iandees committed May 4, 2013
1 parent abe922b commit e715af7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Vagrantfile
Expand Up @@ -3,8 +3,8 @@


Vagrant::Config.run do |config| Vagrant::Config.run do |config|


config.vm.box = "maverick64" config.vm.box = "precise64"
config.vm.box_url = "https://s3.amazonaws.com/osmdevbox/maverick64.box" config.vm.box_url = "http://files.vagrantup.com/precise64.box"




config.vm.customize [ config.vm.customize [
Expand Down
7 changes: 2 additions & 5 deletions manifests/base.pp
Expand Up @@ -13,9 +13,6 @@
managehome => true, 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": exec { "/usr/bin/apt-get update -y":
user => "root", user => "root",
timeout => 3600, timeout => 3600,
Expand Down Expand Up @@ -71,7 +68,7 @@
ensure => installed, ensure => installed,
} }


package { "libmagick9-dev": package { "graphicsmagick-libmagick-dev-compat":
ensure => installed, ensure => installed,
} }


Expand Down Expand Up @@ -235,4 +232,4 @@
creates => "/home/vagrant/osm_directories_setup.log", creates => "/home/vagrant/osm_directories_setup.log",
logoutput => "true", logoutput => "true",
require => [ Exec["rake_migrate"] ] require => [ Exec["rake_migrate"] ]
} }
2 changes: 1 addition & 1 deletion manifests/osm_database.sh
Expand Up @@ -5,7 +5,7 @@ createuser openstreetmap -s
createdb -E UTF8 -O openstreetmap openstreetmap -T template0 createdb -E UTF8 -O openstreetmap openstreetmap -T template0
createdb -E UTF8 -O openstreetmap osm_test -T template0 createdb -E UTF8 -O openstreetmap osm_test -T template0
createdb -E UTF8 -O openstreetmap osm -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 echo "alter role openstreetmap password 'openstreetmap'" | psql




Expand Down
4 changes: 2 additions & 2 deletions seed.sh
@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh


# bootstrap # 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/tlpinney/osmdevbox.git
git clone https://github.com/puppetlabs/puppet.git git clone https://github.com/puppetlabs/puppet.git
wget http://files.rubyforge.vm.bytemark.co.uk/rubygems/rubygems-1.3.7.tgz wget http://files.rubyforge.vm.bytemark.co.uk/rubygems/rubygems-1.3.7.tgz
Expand All @@ -14,5 +14,5 @@ sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
# sudo apt-get install puppet -y # sudo apt-get install puppet -y


# run puppet scripts # 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.