projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Play with job definitions
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
ftp_upload.pp
diff --git
a/modules/roles/manifests/ftp_upload.pp
b/modules/roles/manifests/ftp_upload.pp
index
326ff5b
..
682d314
100644
(file)
--- a/
modules/roles/manifests/ftp_upload.pp
+++ b/
modules/roles/manifests/ftp_upload.pp
@@
-1,22
+1,32
@@
class roles::ftp_upload {
$bind = $::hostname ? {
class roles::ftp_upload {
$bind = $::hostname ? {
+ kassia => '::ffff:130.89.149.224',
default => '',
}
$bind6 = $::hostname ? {
default => '',
}
$bind6 = $::hostname ? {
+ kassia => '2001:610:1908:a000:21b:78ff:fe75:3d46',
default => '',
}
vsftpd::site { 'ftp-upload':
default => '',
}
vsftpd::site { 'ftp-upload':
- source => 'puppet:///modules/roles/ftp_upload/vsftpd.conf',
- bind => $bind,
+ banner => 'ftp.upload.debian.org FTP server',
+ logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+ writable => true,
+ chown_user => dak,
+ bind => $bind,
+ root => '/srv/upload.debian.org/ftp',
}
if $bind6 {
vsftpd::site { 'ftp-upload-v6':
}
if $bind6 {
vsftpd::site { 'ftp-upload-v6':
- source => 'puppet:///modules/roles/security_mirror/vsftpd.conf',
- bind => $bind6,
+ banner => 'ftp.upload.debian.org FTP server',
+ logfile => '/var/log/ftp/vsftpd-ftp.upload.debian.org.log',
+ writable => true,
+ chown_user => dak,
+ bind => $bind6,
+ root => '/srv/upload.debian.org/ftp',
}
}
}
}
}
}