Merge pull request #160 from EmersonPrado/Issue_77

[Issue #77] Move nested defined types to their own manifests

Author: maxchk

Rakefile

@@ -5,8 +5,6 @@ PuppetLint.configuration.send("disable_80chars")
 PuppetLint.configuration.send('disable_class_parameter_defaults')
 PuppetLint.configuration.send('disable_class_inherits_from_params_class')
 PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_autoloader_layout')
-PuppetLint.configuration.send('disable_nested_classes_or_defines')
 PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
 PuppetLint.configuration.fail_on_warnings = true
 

manifests/acl.pp

@@ -28,30 +28,3 @@
     }
   }
 }
-
-define varnish::acl_member(
-  $varnish_fqdn,
-  $acl,
-  $host,
-) {
-  unless defined(Concat::Fragment["${acl}-acl_head"]) {
-    concat::fragment { "${acl}-acl_head":
-      target  => "${varnish::vcl::includedir}/acls.vcl",
-      content => "acl ${acl} {\n",
-      order   => "02-${acl}-1-0",
-      notify  => Service['varnish'],
-    } -> concat::fragment { "${acl}-acl_tail":
-      target  => "${varnish::vcl::includedir}/acls.vcl",
-      content => "}\n",
-      order   => "02-${acl}-3-0",
-      notify  => Service['varnish'],
-    }
-  }
-  $hosts = [$host]
-  concat::fragment { "${acl}-acl_${host}":
-    target  => "${varnish::vcl::includedir}/acls.vcl",
-    content => template('varnish/includes/acls_body.vcl.erb'),
-    order   => "02-${acl}-2-${host}",
-    notify  => Service['varnish'],
-  }
-}

manifests/acl_member.pp

@@ -0,0 +1,27 @@
+# Defined type varnish::acl_member
+define varnish::acl_member(
+  $varnish_fqdn,
+  $acl,
+  $host,
+) {
+  unless defined(Concat::Fragment["${acl}-acl_head"]) {
+    concat::fragment { "${acl}-acl_head":
+      target  => "${varnish::vcl::includedir}/acls.vcl",
+      content => "acl ${acl} {\n",
+      order   => "02-${acl}-1-0",
+      notify  => Service['varnish'],
+    } -> concat::fragment { "${acl}-acl_tail":
+      target  => "${varnish::vcl::includedir}/acls.vcl",
+      content => "}\n",
+      order   => "02-${acl}-3-0",
+      notify  => Service['varnish'],
+    }
+  }
+  $hosts = [$host]
+  concat::fragment { "${acl}-acl_${host}":
+    target  => "${varnish::vcl::includedir}/acls.vcl",
+    content => template('varnish/includes/acls_body.vcl.erb'),
+    order   => "02-${acl}-2-${host}",
+    notify  => Service['varnish'],
+  }
+}

manifests/vcl.pp

@@ -67,25 +67,6 @@
   validate_array($unset_headers)
   validate_array($unset_headers_debugips)
 
-  # define include file type
-  define includefile {
-    $selectors = $varnish::vcl::selectors
-    concat { "${varnish::vcl::includedir}/${title}.vcl":
-      owner   => 'root',
-      group   => 'root',
-      mode    => '0444',
-      notify  => Service['varnish'],
-      require => File[$varnish::vcl::includedir],
-      before  => Exec['restart-varnish'],
-    }
-
-    concat::fragment { "${title}-header":
-      target  => "${varnish::vcl::includedir}/${title}.vcl",
-      content => "# File managed by Puppet\n",
-      order   => '01',
-    }
-  }
-
   # select template to use
   if $template {
     $template_vcl = $template

manifests/vcl/includefile.pp

@@ -0,0 +1,19 @@
+# Defined type varnish::vcl::includefile
+#
+define varnish::vcl::includefile {
+  $selectors = $varnish::vcl::selectors
+  concat { "${varnish::vcl::includedir}/${title}.vcl":
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0444',
+    notify  => Service['varnish'],
+    require => File[$varnish::vcl::includedir],
+    before  => Exec['restart-varnish'],
+  }
+
+  concat::fragment { "${title}-header":
+    target  => "${varnish::vcl::includedir}/${title}.vcl",
+    content => "# File managed by Puppet\n",
+    order   => '01',
+  }
+}