add ldap/mysql/pgsql parameters to pureftpd::config

As a replacement for `$default_auth` used the templates
jhoblitt · Aug 2, 2013 · 9aa1ad3 · 9aa1ad3
1 parent 1296a7b
commit 9aa1ad3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -79,6 +79,9 @@
   $fortunesfile        = false,
   $dontresolve         = true,
   $maxidletime         = '15',
+  $ldapconfigfile      = false,
+  $mysqlconfigfile     = false,
+  $pgsqlconfigfile     = false,
   $pamauthentication   = true,
   $unixauthentication  = false,
   $limitrecursion      = '10000 8',
@@ -117,18 +120,6 @@
   $ipv6only            = false,
 ) inherits pureftpd::params {
 
-  $default_auth  = 'unix'
-
-#  if ($motd_file != undef) {
-#    file { '/etc/motd.pureftpd':
-#      ensure => file,
-#      source => $motd_file,
-#      owner  => 'root',
-#      group  => 'root',
-#      mode   => '0644'
-#    }
-#  }
-
   file { "${pureftpd::params::config_dir}/pure-ftpd.conf":
     ensure  => file,
     content => template("${module_name}/${::osfamily}/pure-ftpd.conf.erb"),

diff --git a/templates/RedHat/pure-ftpd.conf.erb b/templates/RedHat/pure-ftpd.conf.erb
@@ -115,18 +115,18 @@ MaxIdleTime                 <%= @maxidletime %>
 
 # LDAP configuration file (see README.LDAP)
 
-<% if default_auth != 'ldap' %># <% end -%>LDAPConfigFile                /etc/pure-ftpd/pureftpd-ldap.conf
+<% if not @ldapconfigfile %># <% end -%>LDAPConfigFile                /etc/pure-ftpd/pureftpd-ldap.conf
 
 
 
 # MySQL configuration file (see README.MySQL)
 
-<% if default_auth != 'mysql' %># <% end -%>MySQLConfigFile               /etc/pure-ftpd/pureftpd-mysql.conf
+<% if not @mysqlconfigfile %># <% end -%>MySQLConfigFile               /etc/pure-ftpd/pureftpd-mysql.conf
 
 
 # Postgres configuration file (see README.PGSQL)
 
-<% if default_auth != 'pgsql' %># <% end -%>PGSQLConfigFile               /etc/pure-ftpd/pureftpd-pgsql.conf
+<% if not @pgsqlconfigfile %># <% end -%>PGSQLConfigFile               /etc/pure-ftpd/pureftpd-pgsql.conf
 
 
 # PureDB user database (see README.Virtual-Users)