diff options
| author | mh <mh@immerda.ch> | 2010-08-07 02:12:12 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-08-07 02:12:12 +0200 |
| commit | d50296539fc641b6387fcea712d950785c83cea3 (patch) | |
| tree | a02cba7455e86e73d6e040f0b00e84767f87b29b /manifests/openbsd.pp | |
| parent | f534d097fb2ac5c49ce71f8a47d4de97efd22e28 (diff) | |
remove unnecessary fileserver variable (#2460)
Diffstat (limited to 'manifests/openbsd.pp')
| -rw-r--r-- | manifests/openbsd.pp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp index 2cf5fd4..68a13b1 100644 --- a/manifests/openbsd.pp +++ b/manifests/openbsd.pp @@ -26,10 +26,10 @@ class apache::openbsd inherits apache::base { } 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; } |