Skip to content

Commit d351586

Browse files
author
Joshua Hoblitt
committed
mv pureftpd::config_{ldap,mysql,pgsql} -> pureftpd::config::{ldap,mysql,pgsql}
1 parent 7e1aa36 commit d351586

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎manifests/config_ldap.pp ‎manifests/config/ldap.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# == Class: pureftpd::config
1+
# == Class: pureftpd::config::ldap
22
#
33
# This module manages the pure-ftpd configuration files with LDAP
44
# authentication
@@ -12,7 +12,7 @@
1212
# Joshua Hoblitt <[email protected]>
1313
#
1414

15-
class pureftpd::config_ldap (
15+
class pureftpd::config::ldap (
1616
$ldapport = undef,
1717
$ldapbinddn = undef,
1818
$ldapbindpw = undef,

‎manifests/config_mysql.pp ‎manifests/config/mysql.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# == Class: pureftpd::config
1+
# == Class: pureftpd::config::mysql
22
#
33
# This module manages the pure-ftpd configuration files with mysql
44
# authentication
@@ -16,7 +16,7 @@
1616
# - implement template and variables for the mysql config file
1717
#
1818

19-
class pureftpd::config_mysql inherits pureftpd::params {
19+
class pureftpd::config::mysql inherits pureftpd::params {
2020

2121
file { $pureftpd::params::mysql_conf_path:
2222
ensure => file,

‎manifests/config_pgsql.pp ‎manifests/config/pgsql.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# == Class: pureftpd::config_pgsql
1+
# == Class: pureftpd::config::pgsql
22
#
33
# This module manages the pure-ftpd configuration files with pgsql
44
# authentication
@@ -13,7 +13,7 @@
1313
# - implement template and variables for the pgsql config file
1414
#
1515

16-
class pureftpd::config_pgsql inherits pureftpd::params {
16+
class pureftpd::config::pgsql inherits pureftpd::params {
1717

1818
file { $pureftpd::params::pgsql_conf_path:
1919
ensure => file,

‎spec/classes/config_ldap_spec.rb

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
require 'spec_helper'
22

3-
describe 'pureftpd::config_ldap' do
3+
describe 'pureftpd::config::ldap' do
44
let(:facts) {{ :osfamily=> 'RedHat' }}
55

66
describe 'with no params' do
77
it do
8-
should contain_class('pureftpd::config_ldap')
8+
should contain_class('pureftpd::config::ldap')
99
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
1010
.with_ensure('file').with_content('')
1111
end
@@ -14,7 +14,7 @@
1414
describe 'with ldapport' do
1515
let(:params) {{ :ldapport => '389' }}
1616
it do
17-
should contain_class('pureftpd::config_ldap')
17+
should contain_class('pureftpd::config::ldap')
1818
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
1919
.with_ensure('file') \
2020
.with_content(/^LDAPPort 389/)
@@ -24,7 +24,7 @@
2424
describe 'with ldapbinddn' do
2525
let(:params) {{ :ldapbinddn => 'cn=Manager,dc=c9x,dc=org' }}
2626
it do
27-
should contain_class('pureftpd::config_ldap')
27+
should contain_class('pureftpd::config::ldap')
2828
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
2929
.with_ensure('file') \
3030
.with_content(/^LDAPBindDN cn=Manager,dc=c9x,dc=org/)
@@ -34,7 +34,7 @@
3434
describe 'with ldapbindpw' do
3535
let(:params) {{ :ldapbindpw => 'r00tPaSsw0rD' }}
3636
it do
37-
should contain_class('pureftpd::config_ldap')
37+
should contain_class('pureftpd::config::ldap')
3838
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
3939
.with_ensure('file') \
4040
.with_content(/^LDAPBindPW r00tPaSsw0rD/)
@@ -44,7 +44,7 @@
4444
describe 'with ldapbasedn' do
4545
let(:params) {{ :ldapbasedn => 'cn=Users,dc=c9x,dc=org' }}
4646
it do
47-
should contain_class('pureftpd::config_ldap')
47+
should contain_class('pureftpd::config::ldap')
4848
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
4949
.with_ensure('file') \
5050
.with_content(/^LDAPBaseDN cn=Users,dc=c9x,dc=org/)
@@ -54,7 +54,7 @@
5454
describe 'with ldapfilter' do
5555
let(:params) {{ :ldapfilter => '(&(objectClass=posixAccount)(uid=\L))' }}
5656
it do
57-
should contain_class('pureftpd::config_ldap')
57+
should contain_class('pureftpd::config::ldap')
5858
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
5959
.with_ensure('file') \
6060
.with_content(Regexp.new(Regexp.quote('LDAPFilter (&(objectClass=posixAccount)(uid=\L))')))
@@ -64,7 +64,7 @@
6464
describe 'with ldaphomedir' do
6565
let(:params) {{ :ldaphomedir => 'homeDirectory' }}
6666
it do
67-
should contain_class('pureftpd::config_ldap')
67+
should contain_class('pureftpd::config::ldap')
6868
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
6969
.with_ensure('file') \
7070
.with_content(/^LDAPHomeDir homeDirectory/)
@@ -74,7 +74,7 @@
7474
describe 'with ldapversion' do
7575
let(:params) {{ :ldapversion => '3' }}
7676
it do
77-
should contain_class('pureftpd::config_ldap')
77+
should contain_class('pureftpd::config::ldap')
7878
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
7979
.with_ensure('file') \
8080
.with_content(/^LDAPVersion 3/)
@@ -84,7 +84,7 @@
8484
describe 'with ldapdefaultuid' do
8585
let(:params) {{ :ldapdefaultuid => '100' }}
8686
it do
87-
should contain_class('pureftpd::config_ldap')
87+
should contain_class('pureftpd::config::ldap')
8888
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
8989
.with_ensure('file') \
9090
.with_content(/^LDAPDefaultUID 100/)
@@ -94,7 +94,7 @@
9494
describe 'with ldapforcedefaultuid' do
9595
let(:params) {{ :ldapforcedefaultuid => 'False' }}
9696
it do
97-
should contain_class('pureftpd::config_ldap')
97+
should contain_class('pureftpd::config::ldap')
9898
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
9999
.with_ensure('file') \
100100
.with_content(/^LDAPForceDefaultUID False/)
@@ -104,7 +104,7 @@
104104
describe 'with ldapdefaultgid' do
105105
let(:params) {{ :ldapdefaultgid => '100' }}
106106
it do
107-
should contain_class('pureftpd::config_ldap')
107+
should contain_class('pureftpd::config::ldap')
108108
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
109109
.with_ensure('file') \
110110
.with_content(/^LDAPDefaultGID 100/)
@@ -114,7 +114,7 @@
114114
describe 'with ldapdefaultgid' do
115115
let(:params) {{ :ldapdefaultgid => '100' }}
116116
it do
117-
should contain_class('pureftpd::config_ldap')
117+
should contain_class('pureftpd::config::ldap')
118118
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
119119
.with_ensure('file') \
120120
.with_content(/^LDAPDefaultGID 100/)
@@ -124,7 +124,7 @@
124124
describe 'with ldapforcedefaultgid' do
125125
let(:params) {{ :ldapforcedefaultgid => 'False' }}
126126
it do
127-
should contain_class('pureftpd::config_ldap')
127+
should contain_class('pureftpd::config::ldap')
128128
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
129129
.with_ensure('file') \
130130
.with_content(/^LDAPForceDefaultGID False/)
@@ -134,7 +134,7 @@
134134
describe 'with ldapusetls' do
135135
let(:params) {{ :ldapusetls => 'False' }}
136136
it do
137-
should contain_class('pureftpd::config_ldap')
137+
should contain_class('pureftpd::config::ldap')
138138
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
139139
.with_ensure('file') \
140140
.with_content(/^LDAPUseTLS False/)
@@ -144,7 +144,7 @@
144144
describe 'with ldapauthmethod' do
145145
let(:params) {{ :ldapauthmethod => 'PASSWORD' }}
146146
it do
147-
should contain_class('pureftpd::config_ldap')
147+
should contain_class('pureftpd::config::ldap')
148148
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
149149
.with_ensure('file') \
150150
.with_content(/^LDAPAuthMethod PASSWORD/)
@@ -170,7 +170,7 @@
170170
:ldapauthmethod => 'PASSWORD',
171171
}}
172172
it do
173-
should contain_class('pureftpd::config_ldap')
173+
should contain_class('pureftpd::config::ldap')
174174
should contain_file('/etc/pure-ftpd/pureftpd-ldap.conf') \
175175
.with_ensure('file') \
176176
.with_content(/^LDAPPort 389/) \

0 commit comments

Comments
 (0)