add additional pure-ftpd.conf options

Support for these options: * UnixAuthentication * PAMAuthentication * TLSCipherSuite
jhoblitt · Sep 10, 2013 · d7cd213 · d7cd213
1 parent ae03a97
commit d7cd213
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -43,6 +43,7 @@
   $trustedip                  = undef,
   $altlog                     = undef,
   $pidfile                    = undef,
+  $tlsciphersuite             = undef, # added post 1.0.31
   $maxidletime                = undef,
   $maxdiskusage               = undef,
   $trustedgid                 = undef,
@@ -63,6 +64,8 @@
   $pgsqlconfigfile            = undef,
   $puredb                     = undef,
   $extauth                    = undef,
+  $pamauthentication          = undef,
+  $unixauthentication         = undef,
 ) inherits pureftpd::params {
 
   # options taken from pure-ftpd-1.0.30/configuration-file/pure-config.pl
@@ -106,6 +109,7 @@
     'TrustedIP',
     'AltLog',
     'PIDFile',
+    'TLSCipherSuite',
     'MaxIdleTime',
     'MaxDiskUsage',
     'TrustedGID',
@@ -126,6 +130,8 @@
     'PGSQLConfigFile',
     'PureDB',
     'ExtAuth',
+    'UnixAuthentication',
+    'PAMAuthentication',
   ]
 
   file { $pureftpd::params::conf_path:

diff --git a/spec/classes/config_spec.rb b/spec/classes/config_spec.rb
@@ -40,6 +40,7 @@
   'TrustedIP',
   'AltLog',
   'PIDFile',
+  'TLSCipherSuite',
   'MaxIdleTime',
   'MaxDiskUsage',
   'TrustedGID',
@@ -60,6 +61,8 @@
   'PGSQLConfigFile',
   'PureDB',
   'ExtAuth',
+  'UnixAuthentication',
+  'PAMAuthentication',
 ]
 
 describe 'pureftpd::config' do