From d50296539fc641b6387fcea712d950785c83cea3 Mon Sep 17 00:00:00 2001 From: mh Date: Sat, 7 Aug 2010 02:12:12 +0200 Subject: remove unnecessary fileserver variable (#2460) --- manifests/openbsd.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'manifests/openbsd.pp') 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; } -- cgit v1.2.3 From b11bb5a891e96fafa01a431db8e168a41948b88a Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 9 Oct 2011 03:34:29 +0200 Subject: migrate to new file_line type --- manifests/openbsd.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/openbsd.pp') diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp index 68a13b1..f1c8ac0 100644 --- a/manifests/openbsd.pp +++ b/manifests/openbsd.pp @@ -20,8 +20,8 @@ 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': -- cgit v1.2.3 From 4ff385d82bc0d300d501bf1fb41df8602c7c95a6 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 29 May 2012 22:50:03 +0200 Subject: rename site modules --- manifests/openbsd.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/openbsd.pp') diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp index f1c8ac0..e570dbf 100644 --- a/manifests/openbsd.pp +++ b/manifests/openbsd.pp @@ -26,9 +26,9 @@ class apache::openbsd inherits apache::base { } file{'apache_main_config': path => "${config_dir}/conf/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", + 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; -- cgit v1.2.3 From 076909377eaa3aa41936e3acb7e02a9b5b14d493 Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 31 May 2012 11:38:45 +0200 Subject: fix various puppet language things --- manifests/openbsd.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'manifests/openbsd.pp') diff --git a/manifests/openbsd.pp b/manifests/openbsd.pp index e570dbf..1ba58f4 100644 --- a/manifests/openbsd.pp +++ b/manifests/openbsd.pp @@ -26,8 +26,8 @@ class apache::openbsd inherits apache::base { } file{'apache_main_config': path => "${config_dir}/conf/httpd.conf", - source => [ "puppet:///modules/site_apache/config/OpenBSD/${fqdn}/httpd.conf", - "puppet:///modules/site_apache/config/OpenBSD/${apache_cluster_node}/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'], -- cgit v1.2.3