projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ftp-master as historical_master (part of RT#7644)
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
ftp_master.pp
diff --git
a/modules/roles/manifests/ftp_master.pp
b/modules/roles/manifests/ftp_master.pp
index
c733479
..
37219b6
100644
(file)
--- a/
modules/roles/manifests/ftp_master.pp
+++ b/
modules/roles/manifests/ftp_master.pp
@@
-1,4
+1,15
@@
-class roles::ftp_master {
+# ftpmaster role
+#
+# @param db_port port of the database cluster for ftp-master's dak
+class roles::ftp_master (
+ Integer $db_port,
+)
+{
+ include roles::dakmaster
+ include roles::signing
+ include roles::historical_master
+ include apache2
+
rsync::site { 'dakmaster':
source => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
# Needs to be at least number of direct mirrors plus some spare
rsync::site { 'dakmaster':
source => 'puppet:///modules/roles/dakmaster/rsyncd.conf',
# Needs to be at least number of direct mirrors plus some spare
@@
-16,7
+27,17
@@
class roles::ftp_master {
@@ferm::rule::simple { "dsa-ssh-from-ftp_master-${::fqdn}":
tag => 'ssh::server::from::ftp_master',
description => 'Allow ssh access from ftp_master',
@@ferm::rule::simple { "dsa-ssh-from-ftp_master-${::fqdn}":
tag => 'ssh::server::from::ftp_master',
description => 'Allow ssh access from ftp_master',
-
port => '22
',
+
chain => 'ssh
',
saddr => $base::public_addresses,
}
saddr => $base::public_addresses,
}
+
+ postgres::cluster::hba_entry { 'dak-guest':
+ pg_port => $db_port,
+ database => 'projectb',
+ user => 'guest',
+ address => '127.0.0.1',
+ method => 'trust',
+ order => '20',
+ firewall => false,
+ }
}
}