Realigned structure to the standard skeleon 0.0.2

Author: alvagante

.fixtures.yml.erb

@@ -1,5 +1,6 @@
 fixtures:
   repositories:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+    stdmod: "git://github.com/stdmod/stdmod.git"
   symlinks:
     <%= metadata.name %>: "#{source_dir}"

Modulefile.erb

@@ -1,9 +1,10 @@
 name          '<%= metadata.full_module_name %>'
-version       '0.0.1'
+version       '0.0.2'
 source        '<%= metadata.source %>'
 author        '<%= metadata.author %>'
 license       '<%= metadata.license %>'
 summary       'This module installs and manages <%= metadata.name %>'
-description   '<%= metadata.description %>'
+description   '<%= metadata.description %>. Based of stdmod/puppet-skeleton-standard 0.0.2.'
 project_page  '<%= metadata.project_page %>'
 dependency    'puppetlabs/stdlib'
+dependency    'example42/stdmod'

README.md

@@ -18,7 +18,7 @@ This module installs and configures <%= metadata.name %>.
 
 ##Module Description
 
-The module is based on **stdmod** naming standars.
+The module is based on **stdmod** naming standards version 0.9.0.
 
 Refer to http://github.com/stdmod/ for complete documentation on the common parameters.
 
@@ -30,7 +30,8 @@ Refer to http://github.com/stdmod/ for complete documentation on the common para
 * Can manage all the configuration files (by default no file is changed)
 
 ###Setup Requirements
-* PuppetLabs stdlib module
+* PuppetLabs [stdlib module](https://github.com/puppetlabs/puppetlabs-stdlib)
+* StdMod [stdmod module](https://github.com/stdmod/stdmod)
 * Puppet version >= 2.7.x
 * Facter version >= 1.6.2
 

README.markdown.erb renamed to README.md.erb

@@ -0,0 +1,8 @@
+---
+package_name: '<%= metadata.name %>'
+service_name: '<%= metadata.name %>'
+config_file_path:  '/etc/<%= metadata.name %>/<%= metadata.name %>.conf'
+config_file_mode: '0644'
+config_file_owner: 'root'
+config_file_group: 'root'
+config_dir_path: '/etc/<%= metadata.name %>'

data/common.yaml.erb

@@ -0,0 +1,9 @@
+---
+version: 2
+hierarchy:
+  [ ['osfamily', '${osfamily}', 'data/osfamily/${osfamily}' ],
+    ['common', 'true', 'data/common' ]
+  ]
+backends:
+  - yaml
+  - json

data/osfamily/.gitkeep

@@ -36,7 +36,11 @@
 #   name like the  the name of the title a custom template to use as content of configfile
 #   If defined, configfile file has: content => content("$template")
 #
-# [*mode*] [*owner*] [*group*] [*notify*] [*require*] [*replace*]
+# [*mode*]
+# [*owner*]
+# [*group*]
+# [*config_file_require*]
+# [*replace*]
 #   String. Optional. Default: undef
 #   All these parameters map directly to the created file attributes.
 #   If not defined the module's defaults are used.
@@ -57,10 +61,10 @@ define <%= metadata.name %>::conf (
   $mode         = undef,
   $owner        = undef,
   $group        = undef,
-  $notify       = undef,
-  $require      = undef,
   $replace      = undef,
 
+  $config_file_require = undef,
+
   $options_hash = undef,
 
   $ensure       = present ) {
@@ -69,43 +73,13 @@ define <%= metadata.name %>::conf (
 
   include <%= metadata.name %>
 
-  $manage_path = $path ? {
-    undef   => "${<%= metadata.name %>::config_dir_path}/${name}",
-    default => $path,
-  }
-
-  $manage_content = $content ? {
-    undef   => $template ? {
-      undef => undef,
-      default => template($template),
-    },
-    default => $content,
-  }
-
-  $manage_mode = $mode ? {
-    undef   => $<%= metadata.name %>::config_file_mode,
-    default => $mode,
-  }
-
-  $manage_owner = $owner ? {
-    undef   => $<%= metadata.name %>::config_file_owner,
-    default => $owner,
-  }
-
-  $manage_group = $group ? {
-    undef   => $<%= metadata.name %>::config_file_group,
-    default => $group,
-  }
-
-  $manage_require = $require ? {
-    undef   => $<%= metadata.name %>::config_file_require,
-    default => $require,
-  }
-
-  $manage_replace = $replace ? {
-    undef   => $<%= metadata.name %>::config_file_replace,
-    default => $replace,
-  }
+  $manage_path    = pickx($path, "${<%= metadata.name %>::config_dir_path}/${name}")
+  $manage_content = default_content($content, $template)
+  $manage_mode    = pickx($mode, $<%= metadata.name %>::config_file_mode)
+  $manage_owner   = pickx($owner, $<%= metadata.name %>::config_file_owner)
+  $manage_group   = pickx($group, $<%= metadata.name %>::config_file_group)
+  $manage_require = pickx($config_file_require, $<%= metadata.name %>::config_file_require)
+  $manage_replace = pickx($replace, $<%= metadata.name %>::config_file_replace)
 
   file { "<%= metadata.name %>_conf_${name}":
     ensure  => $ensure,
@@ -116,7 +90,6 @@ define <%= metadata.name %>::conf (
     owner   => $manage_owner,
     group   => $manage_group,
     require => $manage_require,
-    notify  => $notify,
     replace => $manage_replace,
   }
 

hiera.yaml

@@ -11,33 +11,30 @@
 #
 class <%= metadata.name %> (
 
-  $ensure                    = 'present',
-  $version                   = undef,
-
   $package_name              = $<%= metadata.name %>::params::package_name,
+  $package_ensure            = 'present',
 
   $config_file_path          = $<%= metadata.name %>::params::config_file_path,
-  $config_file_replace       = $<%= metadata.name %>::params::config_file_replace,
   $config_file_require       = 'Package[<%= metadata.name %>]',
+  $config_file_replace       = undef,
   $config_file_source        = undef,
   $config_file_template      = undef,
   $config_file_content       = undef,
-  $config_file_options_hash  = undef,
+  $config_file_options_hash  = { } ,
 
   $config_dir_path           = $<%= metadata.name %>::params::config_dir_path,
   $config_dir_source         = undef,
   $config_dir_purge          = false,
   $config_dir_recurse        = true,
 
   $dependency_class          = undef,
-
-  $scope_hash_filter         = '(uptime.*|timestamp)',
+  $my_class                  = undef,
 
   ) inherits <%= metadata.name %>::params {
 
 
-  # Input parameters validation
-  validate_re($ensure, ['present','absent'], 'Valid values: present, absent.')
+  # Class variables validation and management
+
   validate_bool($config_dir_recurse)
   validate_bool($config_dir_purge)
   if $config_file_options_hash { validate_hash($config_file_options_hash) }
@@ -46,29 +43,9 @@ class <%= metadata.name %> (
   $config_file_group          = $<%= metadata.name %>::params::config_file_group
   $config_file_mode           = $<%= metadata.name %>::params::config_file_mode
 
-  if $config_file_content {
-    $manage_config_file_content = $config_file_content
-  } else {
-    if $config_file_template {
-      $manage_config_file_content = template($config_file_template)
-    } else {
-      $manage_config_file_content = undef
-    }
-  }
-
-  if $config_file_notify {
-    $manage_config_file_notify = $config_file_notify
-  } else {
-    $manage_config_file_notify = undef
-  }
-
-  if $version {
-    $manage_package_ensure = $version
-  } else {
-    $manage_package_ensure = $ensure
-  }
+  $manage_config_file_content = default_content($config_file_content, $config_file_template)
 
-  if $ensure == 'absent' {
+  if $package_ensure == 'absent' {
     $config_dir_ensure = absent
     $config_file_ensure = absent
   } else {
@@ -77,11 +54,19 @@ class <%= metadata.name %> (
   }
 
 
+  # Dependency class
+
+  if $<%= metadata.name %>::dependency_class {
+    include $<%= metadata.name %>::dependency_class
+  }
+
+
   # Resources managed
 
   if $<%= metadata.name %>::package_name {
-    package { $<%= metadata.name %>::package_name:
-      ensure   => $<%= metadata.name %>::manage_package_ensure,
+    package { '<%= metadata.name %>':
+      ensure   => $<%= metadata.name %>::package_ensure,
+      name     => $<%= metadata.name %>::package_name,
     }
   }
 
@@ -111,11 +96,11 @@ class <%= metadata.name %> (
   }
 
 
+
   # Extra classes
 
-  if $<%= metadata.name %>::dependency_class {
-    include $<%= metadata.name %>::dependency_class
+  if $<%= metadata.name %>::my_class {
+    include $<%= metadata.name %>::my_class
   }
 
 }
-