From 53b9f74623894b4d47a91108f3cc62536bd1f8c7 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Fri, 2 Aug 2013 11:55:56 -0700 Subject: [PATCH] convert pureftpd::config_pgsql from a define into a class --- manifests/config_pgsql.pp | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/manifests/config_pgsql.pp b/manifests/config_pgsql.pp index 45ea4a8..85a6bea 100644 --- a/manifests/config_pgsql.pp +++ b/manifests/config_pgsql.pp @@ -68,7 +68,7 @@ # === TODO: # - implement template and variables for the pgsql config file # -define pureftpd::config_pgsql( +class pureftpd::config_pgsql ( $use_selinux = false, $allow_anonymous = false, $allow_fxp = false, @@ -81,32 +81,7 @@ $use_tls = false, $force_passive_ip = undef, $motd_file = undef -){ - - class { 'pureftpd': - use_selinux => $use_selinux - } - - $default_auth = 'pgsql' - - 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"), - owner => 'root', - group => 'root', - mode => '0644', - notify => Service[$pureftpd::params::service_name] - } +) { file { "${pureftpd::params::config_dir}/pureftpd-pgsql.conf": ensure => file, @@ -116,5 +91,4 @@ mode => '0644', notify => Service[$pureftpd::params::service_name] } - }