projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shorter rule name
[mirror/dsa-puppet.git]
/
modules
/
vsftpd
/
manifests
/
init.pp
diff --git
a/modules/vsftpd/manifests/init.pp
b/modules/vsftpd/manifests/init.pp
index
0ad87ba
..
d59a326
100644
(file)
--- a/
modules/vsftpd/manifests/init.pp
+++ b/
modules/vsftpd/manifests/init.pp
@@
-27,7
+27,7
@@
class vsftpd {
# Ensure the empty dir is present, workaround for #789127
file { '/etc/tmpfiles.d/vsftpd.conf':
# Ensure the empty dir is present, workaround for #789127
file { '/etc/tmpfiles.d/vsftpd.conf':
- content => 'd /var/run/vsftpd/empty 0755 root root -'
+ content => 'd /var/run/vsftpd/empty 0755 root root -'
,
notify => Exec['systemd-tmpfiles --create --exclude-prefix=/dev'],
}
notify => Exec['systemd-tmpfiles --create --exclude-prefix=/dev'],
}
@@
-38,12
+38,16
@@
class vsftpd {
script => 'ps_'
}
script => 'ps_'
}
-
@
ferm::rule { 'dsa-ftp':
+ ferm::rule { 'dsa-ftp':
domain => '(ip ip6)',
description => 'Allow ftp access',
rule => '&SERVICE(tcp, 21)',
}
domain => '(ip ip6)',
description => 'Allow ftp access',
rule => '&SERVICE(tcp, 21)',
}
+ file { '/srv/ftp':
+ ensure => directory,
+ mode => '0755'
+ }
file { '/var/log/ftp':
ensure => directory,
mode => '0755'
file { '/var/log/ftp':
ensure => directory,
mode => '0755'