projects
/
mirror
/
dsa-puppet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cb1653b
)
minor naming fixes
author
Peter Palfrader
<peter@palfrader.org>
Sat, 21 Sep 2019 10:26:20 +0000
(12:26 +0200)
committer
Peter Palfrader
<peter@palfrader.org>
Sat, 21 Sep 2019 10:26:20 +0000
(12:26 +0200)
modules/roles/manifests/ftp_master.pp
patch
|
blob
|
history
modules/roles/manifests/ports_master.pp
patch
|
blob
|
history
modules/roles/manifests/security_master.pp
patch
|
blob
|
history
modules/roles/manifests/syncproxy.pp
patch
|
blob
|
history
diff --git
a/modules/roles/manifests/ftp_master.pp
b/modules/roles/manifests/ftp_master.pp
index
f8d6f87
..
10b5bb6
100644
(file)
--- a/
modules/roles/manifests/ftp_master.pp
+++ b/
modules/roles/manifests/ftp_master.pp
@@
-13,9
+13,9
@@
class roles::ftp_master {
}
# export ssh allow rules for hosts that we should be able to access
}
# export ssh allow rules for hosts that we should be able to access
- @@ferm::rule::simple { "dsa-ssh-from-
syncproxy
-${::fqdn}":
- tag => 'ssh::server::allow::ftp
-
master',
- description => 'Allow ssh access from ftp
-
master',
+ @@ferm::rule::simple { "dsa-ssh-from-
ftp_master
-${::fqdn}":
+ tag => 'ssh::server::allow::ftp
_
master',
+ description => 'Allow ssh access from ftp
_
master',
port => '22',
saddr => $base::public_addresses,
}
port => '22',
saddr => $base::public_addresses,
}
diff --git
a/modules/roles/manifests/ports_master.pp
b/modules/roles/manifests/ports_master.pp
index
31c6503
..
5dc609d
100644
(file)
--- a/
modules/roles/manifests/ports_master.pp
+++ b/
modules/roles/manifests/ports_master.pp
@@
-20,8
+20,8
@@
class roles::ports_master {
}
# export ssh allow rules for hosts that we should be able to access
}
# export ssh allow rules for hosts that we should be able to access
- @@ferm::rule::simple { "dsa-ssh-from-
syncproxy
-${::fqdn}":
- tag => 'ssh::server::allow::ports
-
master',
+ @@ferm::rule::simple { "dsa-ssh-from-
ports_master
-${::fqdn}":
+ tag => 'ssh::server::allow::ports
_
master',
description => 'Allow ssh access from ports-master',
port => '22',
saddr => $base::public_addresses,
description => 'Allow ssh access from ports-master',
port => '22',
saddr => $base::public_addresses,
diff --git
a/modules/roles/manifests/security_master.pp
b/modules/roles/manifests/security_master.pp
index
6f92d33
..
702e2e2
100644
(file)
--- a/
modules/roles/manifests/security_master.pp
+++ b/
modules/roles/manifests/security_master.pp
@@
-13,9
+13,9
@@
class roles::security_master {
}
# export ssh allow rules for hosts that we should be able to access
}
# export ssh allow rules for hosts that we should be able to access
- @@ferm::rule::simple { "dsa-ssh-from-s
yncproxy
-${::fqdn}":
- tag => 'ssh::server::allow::security
-
master',
- description => 'Allow ssh access from security
-
master',
+ @@ferm::rule::simple { "dsa-ssh-from-s
ecurity_master
-${::fqdn}":
+ tag => 'ssh::server::allow::security
_
master',
+ description => 'Allow ssh access from security
_
master',
port => '22',
saddr => $base::public_addresses,
}
port => '22',
saddr => $base::public_addresses,
}
diff --git
a/modules/roles/manifests/syncproxy.pp
b/modules/roles/manifests/syncproxy.pp
index
26e1c5a
..
623393f
100644
(file)
--- a/
modules/roles/manifests/syncproxy.pp
+++ b/
modules/roles/manifests/syncproxy.pp
@@
-78,8
+78,8
@@
class roles::syncproxy {
# syncproxies should be accessible from various role hosts
Ferm::Rule::Simple <<|
tag == 'ssh::server::allow::archvsync' or
# syncproxies should be accessible from various role hosts
Ferm::Rule::Simple <<|
tag == 'ssh::server::allow::archvsync' or
- tag == 'ssh::server::allow::ftp
-
master' or
- tag == 'ssh::server::allow::ports
-
master' or
- tag == 'ssh::server::allow::security
-
master'
+ tag == 'ssh::server::allow::ftp
_
master' or
+ tag == 'ssh::server::allow::ports
_
master' or
+ tag == 'ssh::server::allow::security
_
master'
|>>
}
|>>
}