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/centos.pp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'manifests/centos.pp') diff --git a/manifests/centos.pp b/manifests/centos.pp index 4181152..7f8ba94 100644 --- a/manifests/centos.pp +++ b/manifests/centos.pp @@ -10,16 +10,16 @@ class apache::centos inherits apache::package { restart => '/etc/init.d/httpd graceful', } File[vhosts_dir]{ - path => "$config_dir/vhosts.d", + path => "${config_dir}/vhosts.d", } File[config_dir]{ - path => "$config_dir/conf.d", + path => "${config_dir}/conf.d", } File[include_dir]{ - path => "$config_dir/include.d", + path => "${config_dir}/include.d", } File[modules_dir]{ - path => "$config_dir/modules.d", + path => "${config_dir}/modules.d", } File[web_dir]{ path => "/var/www/vhosts", @@ -40,7 +40,7 @@ class apache::centos inherits apache::package { } file{'apache_service_config': path => '/etc/sysconfig/httpd', - source => [ "puppet:///modules/site_apache/service/CentOS/${fqdn}/httpd", + source => [ "puppet:///modules/site_apache/service/CentOS/${::fqdn}/httpd", "puppet:///modules/site_apache/service/CentOS/httpd", "puppet:///modules/apache/service/CentOS/httpd" ], require => Package['apache'], -- cgit v1.2.3