summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-11-27 11:12:17 -0500
committerMicah Anderson <micah@riseup.net>2012-11-27 12:27:27 -0500
commitda0d9f3c407ffdae0d7583ef148d7e37cbbc20ad (patch)
tree1077d5fb4e93a88f589938278274d57aa97b16fc
parentd5596882123891ea1b3e3c9ddc1a1f683f213771 (diff)
add hiera keys for provider
include site_webapp::apache
-rw-r--r--puppet/modules/site_webapp/manifests/init.pp10
1 files changed, 6 insertions, 4 deletions
diff --git a/puppet/modules/site_webapp/manifests/init.pp b/puppet/modules/site_webapp/manifests/init.pp
index 99f6df6c..08b7f92c 100644
--- a/puppet/modules/site_webapp/manifests/init.pp
+++ b/puppet/modules/site_webapp/manifests/init.pp
@@ -1,13 +1,17 @@
class site_webapp {
+ $definition_files = hiera('definition_files')
+ $provider = $definition_files['provider']
+
Class[Ruby] -> Class[rubygems] -> Class[bundler::install]
class { 'ruby': ruby_version => '1.9.3' }
- include rubygems
-
class { 'bundler::install': install_method => '' }
+ include rubygems
+ include site_webapp::apache
+
group { 'leap-webapp':
ensure => present,
allowdupe => false;
@@ -46,5 +50,3 @@ class site_webapp {
require => [ Class['bundler::install'], Vcsrepo['/srv/leap-webapp'] ];
}
}
-
-