From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 7 Feb 2010 18:22:11 +0000 (-0200)
Subject: Preparing variables before resource definitions
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=13859194594db5744696b5ce03847584f8065285;p=puppet-apache.git

Preparing variables before resource definitions
---

diff --git a/manifests/init.pp b/manifests/init.pp
index f9c3a81..5ad7b16 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -30,6 +30,25 @@ $apache2_macros = "/etc/apache2/conf.d/macros"
 $apache2_conf   = "/etc/apache2/apache2.conf"
 
 class apache {
+  case $apache_www_folder {
+    '': { $apache_www_folder = "/var/www" }
+  }
+
+  case $apache_sites_folder {
+    '': { $apache_sites_folder = "${apache_www_folder}/sites" }
+  }
+
+  case $apache_error_folder {
+    '': { $apache_error_folder = "${apache_www_folder}/error" }
+  }
+
+  case $apache_error_dest {
+    '': { $apache_error_dest = "${apache_error_folder}/index.html" }
+  }
+
+  case $apache_server_name {
+    '': { $apache_server_name = $fqdn }
+  }
 
   package { "apache":
     name   => "apache2",
@@ -75,27 +94,6 @@ class apache {
     notify  => Service["apache"],
   }
 
-  # prepare variables to use in templates
-  case $apache_www_folder {
-    '': { $apache_www_folder = "/var/www" }
-  }
-
-  case $apache_sites_folder {
-    '': { $apache_sites_folder = "${apache_www_folder}/sites" }
-  }
-
-  case $apache_error_folder {
-    '': { $apache_error_folder = "${apache_www_folder}/error" }
-  }
-
-  case $apache_error_dest {
-    '': { $apache_error_dest = "${apache_error_folder}/index.html" }
-  }
-
-  case $apache_server_name {
-    '': { $apache_server_name = $fqdn }
-  }
-
   define site($ensure = present, $docroot = false, $redirect = false,
               $redirect_match = false, $protocol = 'http',
               $server_alias = false, $use = false, $ticket = false,