diff options
| author | Micah Anderson <micah@riseup.net> | 2013-12-16 17:29:02 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-12-16 17:29:02 -0500 |
| commit | 15757eb2334e614bc90c8d5235834352f72261e4 (patch) | |
| tree | f3a3783b50d782b0d8ca76a7884c64e3cbc08dd9 /manifests/openbsd.pp | |
| parent | 6158f2ad0cb07159b922b6036013a7be1e4dbab5 (diff) | |
| parent | 88dc913a5da951b1a261b6cc6d9767aaf641287d (diff) | |
Merge branch 'master' of labs.riseup.net:module_apache into riseup
Diffstat (limited to 'manifests/openbsd.pp')
| -rw-r--r-- | manifests/openbsd.pp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp index 2cf5fd4..1ba58f4 100644 --- a/manifests/openbsd.pp +++ b/manifests/openbsd.pp @@ -20,16 +20,16 @@ class apache::openbsd inherits apache::base { File[web_dir]{ group => daemon, } - line{'enable_apache_on_boot': - file => '/etc/rc.conf.local', + file_line{'enable_apache_on_boot': + path => '/etc/rc.conf.local', line => 'httpd flags=""', } file{'apache_main_config': path => "${config_dir}/conf/httpd.conf", - source => [ "puppet://$server/modules/site-apache/config/OpenBSD/${fqdn}/httpd.conf", - "puppet://$server/modules/site-apache/config/OpenBSD/${apache_cluster_node}/httpd.conf", - "puppet://$server/modules/site-apache/config/OpenBSD//httpd.conf", - "puppet://$server/modules/apache/config/OpenBSD/httpd.conf" ], + source => [ "puppet:///modules/site_apache/config/OpenBSD/${::fqdn}/httpd.conf", + "puppet:///modules/site_apache/config/OpenBSD/${apache::cluster_node}/httpd.conf", + "puppet:///modules/site_apache/config/OpenBSD//httpd.conf", + "puppet:///modules/apache/config/OpenBSD/httpd.conf" ], notify => Service['apache'], owner => root, group => 0, mode => 0644; } @@ -37,7 +37,7 @@ class apache::openbsd inherits apache::base { path => '/var/www/htdocs/default/www/index.html', } file{'/opt/bin/restart_apache.sh': - source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/restart_apache.sh", + source => "puppet:///modules/apache/scripts/OpenBSD/bin/restart_apache.sh", require => File['/opt/bin'], owner => root, group => 0, mode => 0700; } @@ -51,7 +51,7 @@ class apache::openbsd inherits apache::base { stop => 'apachectl stop', } file{'/opt/bin/apache_logrotate.sh': - source => "puppet://$server/modules/apache/scripts/OpenBSD/bin/apache_logrotate.sh", + source => "puppet:///modules/apache/scripts/OpenBSD/bin/apache_logrotate.sh", require => File['/opt/bin'], owner => root, group => 0, mode => 0700; } |