projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ganeti2.ubc.debian.org is born
[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
3876d2a
..
b9ad487
100644
(file)
--- a/
modules/ferm/manifests/per-host.pp
+++ b/
modules/ferm/manifests/per-host.pp
@@
-3,7
+3,7
@@
class ferm::per-host {
include ferm::zivit
}
include ferm::zivit
}
- if $::hostname in [glinka
,rietz
] {
+ if $::hostname in [glinka] {
ferm::rule { 'dsa-rsync':
domain => '(ip ip6)',
description => 'Allow rsync access',
ferm::rule { 'dsa-rsync':
domain => '(ip ip6)',
description => 'Allow rsync access',
@@
-326,12
+326,12
@@
class ferm::per-host {
}
@ferm::rule { 'dsa-postgres-dak':
description => 'Allow postgress access',
}
@ferm::rule { 'dsa-postgres-dak':
description => 'Allow postgress access',
- rule => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 206.12.19.123/32 5.153.231.21/32 5.153.231.18/32 ))'
+ rule => '&SERVICE_RANGE(tcp, 5434, ( 5.153.231.11/32 5.153.231.28/32 206.12.19.123/32 5.153.231.21/32 5.153.231.18/32
5.153.231.29/32
))'
}
@ferm::rule { 'dsa-postgres-dak6':
domain => 'ip6',
description => 'Allow postgress access',
}
@ferm::rule { 'dsa-postgres-dak6':
domain => 'ip6',
description => 'Allow postgress access',
- rule => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:610:4000:216:36ff:fe40:3861/128 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/128 ))'
+ rule => '&SERVICE_RANGE(tcp, 5434, ( 2001:41c8:1000:21::21:11/128 2001:41c8:1000:21::21:28/128 2607:f8f0:610:4000:216:36ff:fe40:3861/128 2001:41c8:1000:21::21:21/128 2001:41c8:1000:21::21:18/128
2001:41c8:1000:21::21:29/128
))'
}
@ferm::rule { 'dsa-postgres-wannabuild':
# wuiet, ullmann, franck
}
@ferm::rule { 'dsa-postgres-wannabuild':
# wuiet, ullmann, franck
@@
-503,6
+503,12
@@
REJECT reject-with icmp-admin-prohibited
rule => 'outerface !tun+ mod mark mark 1 MASQUERADE',
}
}
rule => 'outerface !tun+ mod mark mark 1 MASQUERADE',
}
}
+ ubc-enc2bl1,ubc-enc2bl2,ubc-enc2bl9,ubc-enc2bl10: {
+ @ferm::rule { 'dsa-luca-fixme':
+ description => 'Allow ssh access from mnt and vpn networks',
+ rule => '&SERVICE_RANGE(tcp, 22, ( 172.29.40.0/22 172.29.203.0/24 ))',
+ }
+ }
default: {}
}
# tftp
default: {}
}
# tftp