Skip to content

Commit d7cd213

Browse files
author
Joshua Hoblitt
committed
add additional pure-ftpd.conf options
Support for these options: * UnixAuthentication * PAMAuthentication * TLSCipherSuite
1 parent ae03a97 commit d7cd213

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

manifests/config.pp

+6
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
$trustedip = undef,
4444
$altlog = undef,
4545
$pidfile = undef,
46+
$tlsciphersuite = undef, # added post 1.0.31
4647
$maxidletime = undef,
4748
$maxdiskusage = undef,
4849
$trustedgid = undef,
@@ -63,6 +64,8 @@
6364
$pgsqlconfigfile = undef,
6465
$puredb = undef,
6566
$extauth = undef,
67+
$pamauthentication = undef,
68+
$unixauthentication = undef,
6669
) inherits pureftpd::params {
6770

6871
# options taken from pure-ftpd-1.0.30/configuration-file/pure-config.pl
@@ -106,6 +109,7 @@
106109
'TrustedIP',
107110
'AltLog',
108111
'PIDFile',
112+
'TLSCipherSuite',
109113
'MaxIdleTime',
110114
'MaxDiskUsage',
111115
'TrustedGID',
@@ -126,6 +130,8 @@
126130
'PGSQLConfigFile',
127131
'PureDB',
128132
'ExtAuth',
133+
'UnixAuthentication',
134+
'PAMAuthentication',
129135
]
130136

131137
file { $pureftpd::params::conf_path:

spec/classes/config_spec.rb

+3
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
'TrustedIP',
4141
'AltLog',
4242
'PIDFile',
43+
'TLSCipherSuite',
4344
'MaxIdleTime',
4445
'MaxDiskUsage',
4546
'TrustedGID',
@@ -60,6 +61,8 @@
6061
'PGSQLConfigFile',
6162
'PureDB',
6263
'ExtAuth',
64+
'UnixAuthentication',
65+
'PAMAuthentication',
6366
]
6467

6568
describe 'pureftpd::config' do

0 commit comments

Comments
 (0)