diff options
| author | mh <mh@immerda.ch> | 2009-11-14 14:34:05 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-11-14 14:34:05 +0100 |
| commit | 1b2310bab053cd40616e9740f9d38ef8826b3764 (patch) | |
| tree | c3567eb47a1704cf709aa4341c8c5debb966a53b /manifests/openbsd.pp | |
| parent | 57da0ebe11e5b6f99dc96c13845e4b3205442df1 (diff) | |
update apache module to 0.25.x style
Diffstat (limited to 'manifests/openbsd.pp')
| -rw-r--r-- | manifests/openbsd.pp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp index 005090d..606bdc6 100644 --- a/manifests/openbsd.pp +++ b/manifests/openbsd.pp @@ -1,15 +1,15 @@ ### openbsd class apache::openbsd inherits apache::base { - $config_dir = '/var/www/' + $config_dir = '/var/www' File[vhosts_dir]{ - path => "$config_dir/vhosts.d/", + path => "$config_dir/vhosts.d", } File[modules_dir]{ - path => "$config_dir/conf/modules/", + path => "$config_dir/conf/modules", } File[config_dir]{ - path => "$config_dir/conf.d/", + path => "$config_dir/conf.d", } File['htpasswd_dir']{ group => www, @@ -22,9 +22,9 @@ class apache::openbsd inherits apache::base { line => 'httpd flags=""', } file{"$config_dir/conf/httpd.conf": - source => [ "puppet://$server/files/apache/conf/${fqdn}/httpd.conf", - "puppet://$server/files/apache/conf/${apache_cluster_node}/httpd.conf", - "puppet://$server/files/apache/conf/httpd.conf", + source => [ "puppet://$server/modules/site-apache/conf/${fqdn}/httpd.conf", + "puppet://$server/modules/site-apache/conf/${apache_cluster_node}/httpd.conf", + "puppet://$server/modules/site-apache/conf/httpd.conf", "puppet://$server/modules/apache/conf/${operatingsystem}/httpd.conf", "puppet://$server/modules/apache/conf/httpd.conf" ], notify => Service['apache'], |