aboutsummaryrefslogtreecommitdiffstats
path: root/modules/planet
diff options
context:
space:
mode:
authorDamien Lallement <dams@mageia.org>2011-02-16 01:23:38 +0000
committerDamien Lallement <dams@mageia.org>2011-02-16 01:23:38 +0000
commit6e33a0f611cf84852df0df4b1b8c8a2af7378014 (patch)
tree5c9a83b3172e0aea2488c8ce818bcf2c4bcf4ccc /modules/planet
parent93cf2572f9d9b265af56f6a12d7aa8c78e89a749 (diff)
downloadpuppet-6e33a0f611cf84852df0df4b1b8c8a2af7378014.tar
puppet-6e33a0f611cf84852df0df4b1b8c8a2af7378014.tar.gz
puppet-6e33a0f611cf84852df0df4b1b8c8a2af7378014.tar.bz2
puppet-6e33a0f611cf84852df0df4b1b8c8a2af7378014.tar.xz
puppet-6e33a0f611cf84852df0df4b1b8c8a2af7378014.zip
update to fit with puppet rules explained by misc
Diffstat (limited to 'modules/planet')
-rw-r--r--modules/planet/manifests/init.pp10
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/planet/manifests/init.pp b/modules/planet/manifests/init.pp
index bf46b436..7d9c7786 100644
--- a/modules/planet/manifests/init.pp
+++ b/modules/planet/manifests/init.pp
@@ -1,15 +1,21 @@
class planet {
+
user { "planet":
groups => apache,
comment => "User running cronjob and deploying planet software",
ensure => present,
managehome => true,
+ home => "/var/lib/planet",
}
+ $planet_location = "/var/www/html/planet.$domain"
+ $planet_domain = "planet.$domain"
+
include apache::mod_php
include apache::mod_deflate
- apache::vhost_other_app { "planet.$domain":
- vhost_file => "planet/02_planet_vhosts.conf",
+ apache::vhost_base { "$planet_domain":
+ location => $planet_location,
+ content => template('planet/02_planet_vhosts.conf')
}
file { "/var/www/html/planet.$domain":