From 65f6bb2025218692949530db6703792cc6865c02 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Tue, 5 Jun 2012 21:35:37 -0300
Subject: new style for 2.7

---
 manifests/centos.pp             | 10 +++++-----
 manifests/config/file.pp        |  2 +-
 manifests/vhost/php/standard.pp |  2 +-
 manifests/vhost/php/webapp.pp   |  2 +-
 manifests/vhost/proxy.pp        |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'manifests')

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'],
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}",
diff --git a/manifests/vhost/php/standard.pp b/manifests/vhost/php/standard.pp
index 3814680..b02e05c 100644
--- a/manifests/vhost/php/standard.pp
+++ b/manifests/vhost/php/standard.pp
@@ -135,7 +135,7 @@ define apache::vhost::php::standard(
       $php_safe_mode_exec_dir = $php_settings[safe_mode_exec_dir]
     } else {
       $php_safe_mode_exec_dir =  $path ? {
-        'absent' => $operatingsystem ? {
+        'absent' => $::operatingsystem ? {
           openbsd => "/var/www/htdocs/${name}/bin",
           default => "/var/www/vhosts/${name}/bin"
         },
diff --git a/manifests/vhost/php/webapp.pp b/manifests/vhost/php/webapp.pp
index 69951de..3711c1a 100644
--- a/manifests/vhost/php/webapp.pp
+++ b/manifests/vhost/php/webapp.pp
@@ -74,7 +74,7 @@ define apache::vhost::php::webapp(
         }
 
         if $manage_config {
-            if $config_file == 'absent' { fail("No config file defined for ${name} on ${fqdn}, if you'd like to manage the config, you have to add one!") }
+            if $config_file == 'absent' { fail("No config file defined for ${name} on ${::fqdn}, if you'd like to manage the config, you have to add one!") }
             ::apache::vhost::file::documentrootfile{"configurationfile_${name}":
                 documentroot => $documentroot,
                 filename => $config_file,
diff --git a/manifests/vhost/proxy.pp b/manifests/vhost/proxy.pp
index 113f4ef..1c3b500 100644
--- a/manifests/vhost/proxy.pp
+++ b/manifests/vhost/proxy.pp
@@ -45,7 +45,7 @@ define apache::vhost::proxy(
         htpasswd_file => $htpasswd_file,
         domainalias => $domainalias,
         server_admin => $server_admin,
-        logpath => $operatingsystem ? {
+        logpath => $::operatingsystem ? {
           openbsd => '/var/www/logs',
           centos => '/var/log/httpd',
           default => '/var/log/apache2'
-- 
cgit v1.2.3