Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit b1770bdefd6b81adc8db1c068250ce20719d3227 1 parent 2127001
Ian Dees iandees authored
Showing with 5 additions and 48 deletions.
  1. +4 −47 manifests/base.pp
  2. +1 −1  manifests/osm_database.sh
51 manifests/base.pp
View
@@ -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" ]:
- ensure => installed,
- require => [ Exec["/usr/bin/apt-get update -y"] ]
-}
-
-package { "wget" :
+ "expect", "expect-dev", "libsasl2-dev", "wget", "libapache2-mod-passenger",
+ "ruby-bundler", "rake" ]:
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,37 +88,6 @@
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",
@@ -138,7 +95,7 @@
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":
2  manifests/osm_database.sh
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.