style-guide changes

diff --git a/manifests/init.pp b/manifests/init.pp
index 6590f4b5bb2197c6961ab6c04c6e98d6c6cb17fb..b9ad2f73bc7ffd7aeb55f72b4c48eff5a3fed4bf 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -11,6 +11,13 @@
 # Sample Usage:
 #
 # [Remember: No empty lines between comments and class definition]
-class pureftpd ($auth_type = undef, $config_source = undef, $virtualchroot = false) {
-       include pureftpd::params, pureftpd::install, pureftpd::config, pureftpd::service
+class pureftpd (
+  $auth_type = undef,
+  $config_source = undef,
+  $virtualchroot = false
+) {
+  include pureftpd::params
+  include pureftpd::install
+  include pureftpd::config
+  include pureftpd::service
 }

diff --git a/manifests/params.pp b/manifests/params.pp
index 911da7ef6c18a69b8358f5203a78251e5ed5d70d..5b32e18fed9b1df4b720d1ed61a5bc544dd567eb 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,22 +1,34 @@
 class pureftpd::params {
-    case $operatingsystem {
-        /(Ubuntu|Debian)/: {
-            case $auth_type {
-                'mysql': { $real_auth_type = '-mysql' }
-                'ldap': { $real_auth_type = '-ldap' }
-                'postgresql': { $real_auth_type = '-postgresql' }
-                default: { $real_auth_type = '' }
-            }
-            $package_name = "pure-ftpd${real_auth_type}"
-            $config_dir = '/etc/pure-ftpd/'
-            $service_name = "pure-ftpd${real_auth_type}"
-            $config_default_file = '/etc/default/pure-ftpd-common'
-            $config_source = 'debian'
+  case $::osfamily {
+    'Debian': {
+      case $pureftpd::auth_type {
+        'mysql': {
+          $real_auth_type = '-mysql'
         }
+        'ldap': {
+          $real_auth_type = '-ldap'
+        }
+        'postgresql': {
+          $real_auth_type = '-postgresql'
+        }
+        default: {
+          $real_auth_type = ''
+        }
+      }
+      $package_name = "pure-ftpd${real_auth_type}"
+      $config_dir = '/etc/pure-ftpd/'
+      $service_name = "pure-ftpd${real_auth_type}"
+      $config_default_file = '/etc/default/pure-ftpd-common'
+      $config_source = 'debian'
     }
+  }
 
-    case $pureftpd::virtualchroot {
-        true: { $real_virtualchroot = true }
-        default: { $real_virtualchroot = false }
+  case $pureftpd::virtualchroot {
+    true: {
+      $real_virtualchroot = true
+    }
+    default: {
+      $real_virtualchroot = false
     }
+  }
 }