restructure module so all classes for the inheritance hierarchy pureftpd -> pureftpd::params -> pureftpd::<foo>

Joshua Hoblitt · Joshua Hoblitt · commit 1296a7ba40fd · 2013-01-23T12:34:28.000-07:00
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,

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,11 @@`
`19`	`19`	`#`
`20`	`20`	`class pureftpd (`
`21`	`21`	`$use_selinux=false`
`22`		`-){`
`23`		`- include pureftpd::params, pureftpd::install, pureftpd::service`
	`22`	`+) {`
	`23`	`+ include pureftpd::install, pureftpd::config, pureftpd::service`
	`24`	`+`
	`25`	`+ Class[ 'pureftpd::install' ] ->`
	`26`	`+ Class[ 'pureftpd::config' ] ->`
	`27`	`+ Class[ 'pureftpd::service' ] ->`
	`28`	`+ Class[ 'pureftpd' ]`
`24`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`#`
`14`	`14`	`# 5Ub-Z3r0`
`15`	`15`	`#`
`16`		`-class pureftpd::install {`
	`16`	`+class pureftpd::install inherits pureftpd::params {`
`17`	`17`	`package { $pureftpd::params::package_name:`
`18`	`18`	`ensure => present,`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`#`
`22`	`22`	`# 5Ub-Z3r0`
`23`	`23`	`#`
`24`		`-class pureftpd::params {`
	`24`	`+class pureftpd::params inherits pureftpd {`
`25`	`25`	`case $::osfamily {`
`26`	`26`	`'RedHat':{`
`27`	`27`	`$package_name = $pureftpd::use_selinux ?{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#`
`13`	`13`	`# 5Ub-Z3r0`
`14`	`14`	`#`
`15`		`-class pureftpd::service {`
	`15`	`+class pureftpd::service inherits pureftpd::params {`
`16`	`16`	`service { $pureftpd::params::service_name:`
`17`	`17`	`ensure => running,`
`18`	`18`	`enable => true,`