From 70d7ade1d38b4a906d0ed01fe1a45a99cb4b7392 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 6 Mar 2016 13:56:30 -0300
Subject: Fix conflicting parameter name

---
 manifests/init.pp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'manifests')

diff --git a/manifests/init.pp b/manifests/init.pp
index ed49377..34c3021 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -25,8 +25,8 @@
 #
 
 class apache(
-  $sites          = "/etc/apache2/sites",
   $mods           = "/etc/apache2/mods",
+  $conf_sites     = "/etc/apache2/sites",
   $conf_d         = "/etc/apache2/conf.d",
   $macros         = "/etc/apache2/conf.d/macros.conf",
   $conf           = "/etc/apache2/apache2.conf",
@@ -187,13 +187,13 @@ class apache(
   }
 
   # Legacy configuration
-  file { [ "${sites}-available/default", "${sites}-enabled/000-default" ]:
+  file { [ "${conf_sites}-available/default", "${conf_sites}-enabled/000-default" ]:
     ensure => absent,
     notify => Service["apache"],
   }
 
   # default site configuration
-  file { "${sites}-available/default.conf":
+  file { "${conf_sites}-available/default.conf":
     ensure  => present,
     content => template('apache/default.erb'),
     owner   => root,
@@ -202,10 +202,10 @@ class apache(
     notify  => Service["apache"],
   }
 
-  file { "${sites}-enabled/000-default.conf":
+  file { "${conf_sites}-enabled/000-default.conf":
     owner  => root,
     group  => root,
-    ensure => "${sites}-available/default.conf",
+    ensure => "${conf_sites}-available/default.conf",
     notify => Service["apache"],
   }
 
-- 
cgit v1.2.3