Clean up the base puppet file and get vagrant up running.

tlpinney · May 4, 2013 · b1770bd · b1770bd
1 parent 2127001
commit b1770bd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 48 deletions.
diff --git a/manifests/base.pp b/manifests/base.pp
@@ -28,12 +28,8 @@
            "libpq-dev", "libxml2-dev", "libxslt1-dev", "ruby-dev", "apache2-dev",
            "graphicsmagick-libmagick-dev-compat", "build-essential", "libopenssl-ruby",
            "subversion", "apache2", "postgresql-9.1", "libcurl4-openssl-dev",
-           "expect", "expect-dev", "libsasl2-dev", "wget" ]:
+           "expect", "expect-dev", "libsasl2-dev", "wget", "libapache2-mod-passenger",
-  ensure => installed,
+           "ruby-bundler", "rake" ]:
-  require => [ Exec["/usr/bin/apt-get update -y"] ]
-}
-
-package { "wget" :
   ensure => installed,
   require => [ Exec["/usr/bin/apt-get update -y"] ]
 }
@@ -52,14 +48,6 @@
   require => [Package["git-core"]],
 }
 
-file { "/etc/apache2/conf.d/passenger" :
-  owner => root,
-  group => root,
-  source => "/vagrant/configs/passenger",
-  mode => 644,
-  require => [Package["apache2"]],
-}
-
 file { "/etc/apache2/sites-available/default" :
   owner => root,
   group => root,
@@ -100,45 +88,14 @@
   require => [ Package["postgresql-contrib"] ]
 }
 
-exec { "passenger":
-  cwd => "/home/vagrant",
-  user => "vagrant",
-  command => "sudo gem install passenger --no-ri --no-rdoc && touch /home/vagrant/passenger.log",
-  creates => "/home/vagrant/passenger.log",
-  logoutput => "true",
-  path => ["/usr/bin", "/bin", "/usr/sbin", "/sbin"], 
-  require => [File["/home/vagrant/openstreetmap-website/config/application.yml"]]
-}
-
-exec { "pfusion":
-  cwd => "/home/vagrant",
-  user => "vagrant",
-  command => "expect /vagrant/manifests/pfusion.exp && touch /home/vagrant/pfusion.log",
-  creates => "/home/vagrant/pfusion.log",
-  logoutput => "true",
-  path => ["/usr/bin", "/bin", "/usr/sbin", "/sbin"],
-  timeout => 3600,  
-  require => [Exec["passenger"]]
-}
-
-exec { "bundle_gem":
-  cwd => "/home/vagrant",
-  user => "vagrant",
-  command => "sudo gem install bundle --no-ri --no-rdoc; touch /home/vagrant/bundle_gem.log",
-  creates => "/home/vagrant/bundle_gem.log",
-  logoutput => "true",
-  path => ["/usr/bin", "/bin", "/usr/sbin", "/sbin"], 
-  require => [Exec["pfusion"]]
-} 
-
 exec { "bundle":
   cwd => "/home/vagrant/openstreetmap-website",
   user => "vagrant",
   command => "sudo bundle install && touch /home/vagrant/bundle.log",
   creates => "/home/vagrant/bundle.log",
   logoutput => "true",
   path => ["/usr/bin", "/bin", "/usr/sbin", "/sbin"], 
-  require => [Exec["bundle_gem"]]
+  require => [Exec["osm_git"]]
 } 
 
 exec { "rake_migrate":
@@ -148,7 +105,7 @@
   creates => "/home/vagrant/rake_migrate.log",
   logoutput => "true",
   path => ["/usr/bin", "/bin", "/usr/sbin", "/sbin"], 
-  require => [Exec["bundle"]]
+  require => [Exec["bundle"], File["/home/vagrant/openstreetmap-website/config/application.yml"], Exec["Set up database"]]
 }
 
 exec { "set_up_osm_website_directories":

diff --git a/manifests/osm_database.sh b/manifests/osm_database.sh
@@ -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
-echo "create extension btree_gist;" | psql
+echo "create extension btree_gist;" | psql -d openstreetmap
 echo "alter role openstreetmap password 'openstreetmap'" | psql