From dafb060fc57957dbe9e5e90698537e781cebeaf6 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 10 Mar 2013 15:41:35 +0100
Subject: updated facts in file source for apache2.conf, linted

---
 manifests/debian.pp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'manifests')

diff --git a/manifests/debian.pp b/manifests/debian.pp
index b7a5d9e..828245f 100644
--- a/manifests/debian.pp
+++ b/manifests/debian.pp
@@ -20,17 +20,19 @@ class apache::debian inherits apache::package {
     }
     file { 'apache_main_config':
         path    => "${config_dir}/apache2.conf",
-        source  => [ "puppet://$server/modules/site-apache/config/Debian.${lsbdistcodename}/${fqdn}/apache2.conf",
-                    "puppet://$server/modules/site-apache/config/Debian/{$fqdn}/apache2.conf",
-                    "puppet://$server/modules/site-apache/config/Debian.${lsbdistcodename}/apache2.conf",
-                    "puppet://$server/modules/site-apache/config/Debian/apache2.conf",
-                    "puppet://$server/modules/apache/config/Debian.${lsbdistcodename}/${fqdn}/apache2.conf",
-                    "puppet://$server/modules/apache/config/Debian/{$fqdn}/apache2.conf",
-                    "puppet://$server/modules/apache/config/Debian.${lsbdistcodename}/apache2.conf",
-                    "puppet://$server/modules/apache/config/Debian/apache2.conf" ],
+        source  => [ "puppet:///modules/site-apache/config/Debian.${::lsbdistcodename}/${::fqdn}/apache2.conf",
+                    "puppet:///modules/site-apache/config/Debian/${::fqdn}/apache2.conf",
+                    "puppet:///modules/site-apache/config/Debian.${::lsbdistcodename}/apache2.conf",
+                    'puppet:///modules/site-apache/config/Debian/apache2.conf',
+                    "puppet:///modules/apache/config/Debian.${::lsbdistcodename}/${::fqdn}/apache2.conf",
+                    "puppet:///modules/apache/config/Debian/${::fqdn}/apache2.conf",
+                    "puppet:///modules/apache/config/Debian.${::lsbdistcodename}/apache2.conf",
+                    'puppet:///modules/apache/config/Debian/apache2.conf' ],
         require => Package['apache'],
         notify  => Service['apache'],
-        owner   => root, group => 0, mode => '0644';
+        owner   => root,
+        group   => 0,
+        mode    => '0644';
     }
     apache::config::global{ 'charset': }
     apache::config::global{ 'security': }
-- 
cgit v1.2.3