fix notify pureftpd::service on config* classes from pureftpd class

Author: Joshua Hoblitt

manifests/init.pp

@@ -35,10 +35,12 @@
     $enable_ldap = { ldapconfigfile => $pureftpd::params::ldap_conf_path }
 
     # instantiate a pureftpd::config::ldap that will notify the service class
-    $safe_config_ldap = merge($config,
+    $safe_config_ldap = merge($config_ldap,
       { notify => Class[ 'pureftpd::service' ] }
     )
-    create_resources( 'class', { 'pureftpd::config::ldap' => $config_ldap } )
+    create_resources( 'class',
+      { 'pureftpd::config::ldap' => $safe_config_ldap }
+    )
 
     # only try to create the ldap configuration file after the pureftpd package
     # is installed and configuration; otherwise the dir may not exist yet
@@ -51,10 +53,12 @@
     $enable_pgsql = { pgsqlconfigfile => $pureftpd::params::pgsql_conf_path }
 
     # instantiate a pureftpd::config::mysql will notify the service class
-    $safe_config_pgsql = merge($config,
+    $safe_config_pgsql = merge($config_pgsql,
       { notify => Class[ 'pureftpd::service' ] }
     )
-    create_resources( 'class', { 'pureftpd::config::pgsql' => $config_pgsql } )
+    create_resources( 'class',
+      { 'pureftpd::config::pgsql' => $safe_config_pgsql }
+    )
 
     # only try to create the pgsql configuration file after the pureftpd
     # package is installed and configuration; otherwise the dir may not exist

spec/classes/pureftpd_spec.rb

@@ -128,8 +128,10 @@
     it do
       should include_class('pureftpd') 
       should include_class('pureftpd::install') 
-      should include_class('pureftpd::config') 
-      should include_class('pureftpd::config::ldap') 
+      should contain_class('pureftpd::config') \
+        .with_notify('Class[Pureftpd::Service]')
+      should contain_class('pureftpd::config::ldap') \
+        .with_notify('Class[Pureftpd::Service]')
       should include_class('pureftpd::service') 
       should contain_package('pure-ftpd').with_ensure('present')
       should_not contain_package('pure-ftpd-selinux')
@@ -159,8 +161,10 @@
     it do
       should include_class('pureftpd') 
       should include_class('pureftpd::install') 
-      should include_class('pureftpd::config') 
-      should include_class('pureftpd::config::pgsql') 
+      should contain_class('pureftpd::config') \
+        .with_notify('Class[Pureftpd::Service]')
+      should contain_class('pureftpd::config::pgsql') \
+        .with_notify('Class[Pureftpd::Service]')
       should include_class('pureftpd::service') 
       should contain_package('pure-ftpd').with_ensure('present')
       should_not contain_package('pure-ftpd-selinux')
@@ -180,4 +184,47 @@
     end
   end
 
+  describe 'with all config sections' do
+    let(:params) {{
+      :use_selinux => true,
+      :config      => {
+        'ipv4only'         => 'Yes',
+      },
+      :config_ldap           => {
+        'ldapserver'          => 'ldap.example.com',
+      },
+      :config_pgsql => {
+        'pgsqlserver'         => 'localhost',
+      }
+    }}
+    it do
+      should include_class('pureftpd') 
+      should include_class('pureftpd::install') 
+      should contain_class('pureftpd::config') \
+        .with_notify('Class[Pureftpd::Service]')
+      should contain_class('pureftpd::config::ldap') \
+        .with_notify('Class[Pureftpd::Service]')
+      should contain_class('pureftpd::config::pgsql') \
+        .with_notify('Class[Pureftpd::Service]')
+      should include_class('pureftpd::service') 
+      should contain_package('pure-ftpd').with_ensure('present')
+      should contain_package('pure-ftpd-selinux').with_ensure('present')
+      should contain_file('/etc/pure-ftpd/pure-ftpd.conf').with_ensure('file') \
+        .with_content(%r{PGSQLConfigFile     /etc/pure-ftpd/pureftpd-pgsql.conf})\
+        .with_content(%r{LDAPConfigFile      /etc/pure-ftpd/pureftpd-ldap.conf})
+      should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf').with_ensure('file') \
+        .with_content(<<-END.gsub(/^\s+/, ""))
+        LDAPServer          ldap.example.com
+        END
+      should contain_file('/etc/pure-ftpd/pureftpd-pgsql.conf').with_ensure('file') \
+        .with_content(<<-END.gsub(/^\s+/, ""))
+        PGSQLServer         localhost
+        END
+      should contain_service('pure-ftpd').with({
+        'ensure' => 'running',
+        'enable' => 'true',
+      })
+    end
+  end
+
 end