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/centos/module.pp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'manifests/centos/module.pp') diff --git a/manifests/centos/module.pp b/manifests/centos/module.pp index 4bbf251..b4cddb7 100644 --- a/manifests/centos/module.pp +++ b/manifests/centos/module.pp @@ -10,13 +10,13 @@ define apache::centos::module( } $real_source = $source ? { '' => [ - "puppet://$server/modules/site-apache/modules.d/${fqdn}/${name}.so", - "puppet://$server/modules/site-apache/modules.d/${apache_cluster_node}/${name}.so", - "puppet://$server/modules/site-apache/modules.d/${name}.so", - "puppet://$server/modules/apache/modules.d/${operatingsystem}/${name}.so", - "puppet://$server/modules/apache/modules.d/${name}.so" + "puppet:///modules/site-apache/modules.d/${fqdn}/${name}.so", + "puppet:///modules/site-apache/modules.d/${apache_cluster_node}/${name}.so", + "puppet:///modules/site-apache/modules.d/${name}.so", + "puppet:///modules/apache/modules.d/${operatingsystem}/${name}.so", + "puppet:///modules/apache/modules.d/${name}.so" ], - default => "puppet://$server/$source", + default => "puppet:///$source", } file{"modules_${name}.conf": ensure => $ensure, -- 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/centos/module.pp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'manifests/centos/module.pp') diff --git a/manifests/centos/module.pp b/manifests/centos/module.pp index b4cddb7..4e48b13 100644 --- a/manifests/centos/module.pp +++ b/manifests/centos/module.pp @@ -10,9 +10,9 @@ define apache::centos::module( } $real_source = $source ? { '' => [ - "puppet:///modules/site-apache/modules.d/${fqdn}/${name}.so", - "puppet:///modules/site-apache/modules.d/${apache_cluster_node}/${name}.so", - "puppet:///modules/site-apache/modules.d/${name}.so", + "puppet:///modules/site_apache/modules.d/${fqdn}/${name}.so", + "puppet:///modules/site_apache/modules.d/${apache_cluster_node}/${name}.so", + "puppet:///modules/site_apache/modules.d/${name}.so", "puppet:///modules/apache/modules.d/${operatingsystem}/${name}.so", "puppet:///modules/apache/modules.d/${name}.so" ], -- 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/centos/module.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'manifests/centos/module.pp') diff --git a/manifests/centos/module.pp b/manifests/centos/module.pp index 4e48b13..3220d1f 100644 --- a/manifests/centos/module.pp +++ b/manifests/centos/module.pp @@ -3,17 +3,17 @@ define apache::centos::module( $source = '', $destination = '' ){ - $modules_dir = "$apache::centos::config_dir/modules.d" + $modules_dir = "${apache::centos::config_dir}/modules.d" $real_destination = $destination ? { '' => "${modules_dir}/${name}.so", default => $destination, } $real_source = $source ? { '' => [ - "puppet:///modules/site_apache/modules.d/${fqdn}/${name}.so", - "puppet:///modules/site_apache/modules.d/${apache_cluster_node}/${name}.so", + "puppet:///modules/site_apache/modules.d/${::fqdn}/${name}.so", + "puppet:///modules/site_apache/modules.d/${apache::cluster_node}/${name}.so", "puppet:///modules/site_apache/modules.d/${name}.so", - "puppet:///modules/apache/modules.d/${operatingsystem}/${name}.so", + "puppet:///modules/apache/modules.d/${::operatingsystem}/${name}.so", "puppet:///modules/apache/modules.d/${name}.so" ], default => "puppet:///$source", -- cgit v1.2.3