projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
a mirror for dillon
[mirror/dsa-puppet.git]
/
modules
/
ferm
/
manifests
/
per-host.pp
diff --git
a/modules/ferm/manifests/per-host.pp
b/modules/ferm/manifests/per-host.pp
index
725fc6d
..
611ea90
100644
(file)
--- a/
modules/ferm/manifests/per-host.pp
+++ b/
modules/ferm/manifests/per-host.pp
@@
-12,12
+12,6
@@
class ferm::per-host {
}
case $::hostname {
}
case $::hostname {
- samosa: {
- @ferm::rule { 'dsa-udd-stunnel':
- description => 'port 8080 for udd stunnel',
- rule => '&SERVICE_RANGE(tcp, http-alt, ( 192.25.206.16 70.103.162.29 217.196.43.134 ))'
- }
- }
czerny,clementi: {
@ferm::rule { 'dsa-upsmon':
description => 'Allow upsmon access',
czerny,clementi: {
@ferm::rule { 'dsa-upsmon':
description => 'Allow upsmon access',
@@
-26,34
+20,34
@@
class ferm::per-host {
}
bendel: {
@ferm::rule { 'listmaster-ontp-in':
}
bendel: {
@ferm::rule { 'listmaster-ontp-in':
- description
=> 'ONTP has a broken mail setup',
- table
=> 'filter',
- chain
=> 'INPUT',
- rule
=> 'source 188.165.23.89/32 proto tcp dport 25 jump DROP',
+ description => 'ONTP has a broken mail setup',
+ table => 'filter',
+ chain => 'INPUT',
+ rule => 'source 188.165.23.89/32 proto tcp dport 25 jump DROP',
}
@ferm::rule { 'listmaster-ontp-out':
}
@ferm::rule { 'listmaster-ontp-out':
- description => 'ONTP has a broken mail setup',
- table => 'filter',
- chain => 'OUTPUT',
- rule => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
- }
- }
- abel,alwyn,rietz: {
- @ferm::rule { 'dsa-tftp':
- description => 'Allow tftp access',
- rule => '&SERVICE(udp, 69)'
+ description => 'ONTP has a broken mail setup',
+ table => 'filter',
+ chain => 'OUTPUT',
+ rule => 'destination 78.8.208.246/32 proto tcp dport 25 jump DROP',
}
}
}
}
- paganini: {
- @ferm::rule { 'dsa-dhcp':
- description => 'Allow dhcp access',
- rule => '&SERVICE(udp, 67)'
- }
+ abel,alwyn,rietz,jenkins: {
@ferm::rule { 'dsa-tftp':
description => 'Allow tftp access',
rule => '&SERVICE(udp, 69)'
}
}
@ferm::rule { 'dsa-tftp':
description => 'Allow tftp access',
rule => '&SERVICE(udp, 69)'
}
}
+ #paganini: {
+ # @ferm::rule { 'dsa-dhcp':
+ # description => 'Allow dhcp access',
+ # rule => '&SERVICE(udp, 67)'
+ # }
+ # @ferm::rule { 'dsa-tftp':
+ # description => 'Allow tftp access',
+ # rule => '&SERVICE(udp, 69)'
+ # }
+ #}
lotti,lully: {
@ferm::rule { 'dsa-syslog':
description => 'Allow syslog access',
lotti,lully: {
@ferm::rule { 'dsa-syslog':
description => 'Allow syslog access',
@@
-184,13
+178,13
@@
class ferm::per-host {
ullmann: {
@ferm::rule { 'dsa-postgres-udd':
description => 'Allow postgress access',
ullmann: {
@ferm::rule { 'dsa-postgres-udd':
description => 'Allow postgress access',
- # quantz,
wagner
, master, couper, coccia, franck
- rule => '&SERVICE_RANGE(tcp, 5452, ( 206.12.19.122/32
217.196.43.134/32 217.196.43.132
/32 82.195.75.110/32 5.153.231.14/32 5.153.231.11/32 138.16.160.12/32 ))'
+ # quantz,
moszumanska
, master, couper, coccia, franck
+ rule => '&SERVICE_RANGE(tcp, 5452, ( 206.12.19.122/32
5.153.231.21
/32 82.195.75.110/32 5.153.231.14/32 5.153.231.11/32 138.16.160.12/32 ))'
}
@ferm::rule { 'dsa-postgres-udd6':
domain => '(ip6)',
description => 'Allow postgress access',
}
@ferm::rule { 'dsa-postgres-udd6':
domain => '(ip6)',
description => 'Allow postgress access',
- rule => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:11/32 ))'
+ rule => '&SERVICE_RANGE(tcp, 5452, ( 2607:f8f0:610:4000:216:36ff:fe40:3860/128 2001:41b8:202:deb:216:36ff:fe40:4001/128 2001:41c8:1000:21::21:14/128 2001:41c8:1000:21::21:11/32
2001:41c8:1000:21::21:21/128
))'
}
}
grieg: {
}
}
grieg: {
@@
-218,12
+212,12
@@
class ferm::per-host {
bmdb1: {
@ferm::rule { 'dsa-postgres-main':
description => 'Allow postgress access',
bmdb1: {
@ferm::rule { 'dsa-postgres-main':
description => 'Allow postgress access',
- rule => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32 ))'
+ rule => '&SERVICE_RANGE(tcp, 5435, ( 5.153.231.14/32
5.153.231.23/32
))'
}
@ferm::rule { 'dsa-postgres-main6':
domain => 'ip6',
description => 'Allow postgress access',
}
@ferm::rule { 'dsa-postgres-main6':
domain => 'ip6',
description => 'Allow postgress access',
- rule => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128 ))'
+ rule => '&SERVICE_RANGE(tcp, 5435, ( 2001:41c8:1000:21::21:14/128
2001:41c8:1000:21::21:23/128
))'
}
@ferm::rule { 'dsa-postgres-dak':
description => 'Allow postgress access',
}
@ferm::rule { 'dsa-postgres-dak':
description => 'Allow postgress access',
@@
-281,6
+275,7
@@
class ferm::per-host {
}
}
}
}
+ default: {}
}
# vpn fu
case $::hostname {
}
# vpn fu
case $::hostname {
@@
-309,5
+304,6
@@
REJECT reject-with icmp-admin-prohibited
rule => 'outerface !tun+ mod mark mark 1 MASQUERADE',
}
}
rule => 'outerface !tun+ mod mark mark 1 MASQUERADE',
}
}
+ default: {}
}
}
}
}