restructure module so all classes for the inheritance hierarchy puref…

…tpd -> pureftpd::params -> pureftpd::<foo>
jhoblitt · Jan 23, 2013 · 1296a7b · 1296a7b
1 parent 12b5798
commit 1296a7b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -115,13 +115,7 @@
   $tls                 = false,
   $ipv4only            = false,
   $ipv6only            = false,
-
-  $use_selinux         = false,
-){
-
-  class { 'pureftpd':
-    use_selinux => $use_selinux
-  }
+) inherits pureftpd::params {
 
   $default_auth  = 'unix'
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -19,6 +19,11 @@
 #
 class pureftpd (
   $use_selinux=false
-){
-  include pureftpd::params, pureftpd::install, pureftpd::service
+) {
+  include pureftpd::install, pureftpd::config, pureftpd::service
+
+  Class[ 'pureftpd::install' ] ->
+  Class[ 'pureftpd::config' ] ->
+  Class[ 'pureftpd::service' ] ->
+  Class[ 'pureftpd' ]
 }
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -13,7 +13,7 @@
 #
 # 5Ub-Z3r0
 #
-class pureftpd::install {
+class pureftpd::install inherits pureftpd::params {
   package { $pureftpd::params::package_name:
     ensure  => present,
   }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -21,7 +21,7 @@
 #
 # 5Ub-Z3r0
 #
-class pureftpd::params {
+class pureftpd::params inherits pureftpd {
   case $::osfamily {
     'RedHat':{
       $package_name = $pureftpd::use_selinux ?{

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -12,7 +12,7 @@
 #
 # 5Ub-Z3r0
 #
-class pureftpd::service {
+class pureftpd::service inherits pureftpd::params {
     service { $pureftpd::params::service_name:
         ensure     => running,
         enable     => true,