From f2fad4fa29ff23b2220ba777f54f6be737e051be Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 11 Aug 2010 15:28:58 +0200 Subject: remove unnecessary fileserver variable (#2460) round II --- manifests/config/file.pp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'manifests/config') diff --git a/manifests/config/file.pp b/manifests/config/file.pp index d72ba2e..05108ee 100644 --- a/manifests/config/file.pp +++ b/manifests/config/file.pp @@ -33,16 +33,16 @@ define apache::config::file( 'absent': { $real_source = $source ? { 'absent' => [ - "puppet://${server}/modules/site-apache/${confdir}/${fqdn}/${name}", - "puppet://${server}/modules/site-apache/${confdir}/${apache_cluster_node}/${name}", - "puppet://${server}/modules/site-apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", - "puppet://${server}/modules/site-apache/${confdir}/${operatingsystem}/${name}", - "puppet://${server}/modules/site-apache/${confdir}/${name}", - "puppet://${server}/modules/apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", - "puppet://${server}/modules/apache/${confdir}/${operatingsystem}/${name}", - "puppet://${server}/modules/apache/${confdir}/${name}" + "puppet:///modules/site-apache/${confdir}/${fqdn}/${name}", + "puppet:///modules/site-apache/${confdir}/${apache_cluster_node}/${name}", + "puppet:///modules/site-apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", + "puppet:///modules/site-apache/${confdir}/${operatingsystem}/${name}", + "puppet:///modules/site-apache/${confdir}/${name}", + "puppet:///modules/apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", + "puppet:///modules/apache/${confdir}/${operatingsystem}/${name}", + "puppet:///modules/apache/${confdir}/${name}" ], - default => "puppet://${server}/${source}", + default => "puppet:///${source}", } File["apache_${name}"]{ source => $real_source, -- cgit v1.2.3 From e8e48e7fc60d5551a315f9b0b6a01adfdc0e3558 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 16 Aug 2010 20:35:26 +0200 Subject: only set source or content when we actually manage the file --- manifests/config/file.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'manifests/config') diff --git a/manifests/config/file.pp b/manifests/config/file.pp index 05108ee..3b889ca 100644 --- a/manifests/config/file.pp +++ b/manifests/config/file.pp @@ -29,7 +29,8 @@ define apache::config::file( notify => Service[apache], owner => root, group => 0, mode => 0644; } - case $content { + if $ensure == 'present' { + case $content { 'absent': { $real_source = $source ? { 'absent' => [ @@ -53,6 +54,7 @@ define apache::config::file( content => $content, } } + } } case $operatingsystem { openbsd: { info("no package dependency on ${operatingsystem} for ${name}") } -- 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/config/file.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'manifests/config') diff --git a/manifests/config/file.pp b/manifests/config/file.pp index 3b889ca..f25041c 100644 --- a/manifests/config/file.pp +++ b/manifests/config/file.pp @@ -34,11 +34,11 @@ define apache::config::file( 'absent': { $real_source = $source ? { 'absent' => [ - "puppet:///modules/site-apache/${confdir}/${fqdn}/${name}", - "puppet:///modules/site-apache/${confdir}/${apache_cluster_node}/${name}", - "puppet:///modules/site-apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", - "puppet:///modules/site-apache/${confdir}/${operatingsystem}/${name}", - "puppet:///modules/site-apache/${confdir}/${name}", + "puppet:///modules/site_apache/${confdir}/${fqdn}/${name}", + "puppet:///modules/site_apache/${confdir}/${apache_cluster_node}/${name}", + "puppet:///modules/site_apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", + "puppet:///modules/site_apache/${confdir}/${operatingsystem}/${name}", + "puppet:///modules/site_apache/${confdir}/${name}", "puppet:///modules/apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", "puppet:///modules/apache/${confdir}/${operatingsystem}/${name}", "puppet:///modules/apache/${confdir}/${name}" -- 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/config/file.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'manifests/config') diff --git a/manifests/config/file.pp b/manifests/config/file.pp index f25041c..a5b0f2e 100644 --- a/manifests/config/file.pp +++ b/manifests/config/file.pp @@ -34,13 +34,13 @@ define apache::config::file( 'absent': { $real_source = $source ? { 'absent' => [ - "puppet:///modules/site_apache/${confdir}/${fqdn}/${name}", - "puppet:///modules/site_apache/${confdir}/${apache_cluster_node}/${name}", - "puppet:///modules/site_apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", - "puppet:///modules/site_apache/${confdir}/${operatingsystem}/${name}", + "puppet:///modules/site_apache/${confdir}/${::fqdn}/${name}", + "puppet:///modules/site_apache/${confdir}/${apache::cluster_node}/${name}", + "puppet:///modules/site_apache/${confdir}/${::operatingsystem}.${::lsbdistcodename}/${name}", + "puppet:///modules/site_apache/${confdir}/${::operatingsystem}/${name}", "puppet:///modules/site_apache/${confdir}/${name}", - "puppet:///modules/apache/${confdir}/${operatingsystem}.${lsbdistcodename}/${name}", - "puppet:///modules/apache/${confdir}/${operatingsystem}/${name}", + "puppet:///modules/apache/${confdir}/${::operatingsystem}.${::lsbdistcodename}/${name}", + "puppet:///modules/apache/${confdir}/${::operatingsystem}/${name}", "puppet:///modules/apache/${confdir}/${name}" ], default => "puppet:///${source}", @@ -56,8 +56,8 @@ define apache::config::file( } } } - case $operatingsystem { - openbsd: { info("no package dependency on ${operatingsystem} for ${name}") } + case $::operatingsystem { + openbsd: { info("no package dependency on ${::operatingsystem} for ${name}") } default: { File["apache_${name}"]{ require => Package[apache], -- cgit v1.2.3 From 65f6bb2025218692949530db6703792cc6865c02 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 5 Jun 2012 21:35:37 -0300 Subject: new style for 2.7 --- manifests/config/file.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/config') diff --git a/manifests/config/file.pp b/manifests/config/file.pp index a5b0f2e..f5053e9 100644 --- a/manifests/config/file.pp +++ b/manifests/config/file.pp @@ -13,7 +13,7 @@ define apache::config::file( default: { fail("Wrong config file type specified for ${name}") } } $real_destination = $destination ? { - 'absent' => $operatingsystem ? { + 'absent' => $::operatingsystem ? { centos => "${apache::centos::config_dir}/${confdir}/${name}", gentoo => "${apache::gentoo::config_dir}/${name}", debian => "${apache::debian::config_dir}/${confdir}/${name}", -- cgit v1.2.3 From 726cd714994141080a9169eba97ede5828bb63c2 Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 18 Sep 2012 21:15:58 +0200 Subject: make source better configurable --- manifests/config/file.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'manifests/config') diff --git a/manifests/config/file.pp b/manifests/config/file.pp index f5053e9..76328b5 100644 --- a/manifests/config/file.pp +++ b/manifests/config/file.pp @@ -43,7 +43,7 @@ define apache::config::file( "puppet:///modules/apache/${confdir}/${::operatingsystem}/${name}", "puppet:///modules/apache/${confdir}/${name}" ], - default => "puppet:///${source}", + default => $source } File["apache_${name}"]{ source => $real_source, -- cgit v1.2.3