projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add CSAIL IPv6 range
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
init.pp
diff --git
a/modules/roles/manifests/init.pp
b/modules/roles/manifests/init.pp
index
e6d6d06
..
13ac016
100644
(file)
--- a/
modules/roles/manifests/init.pp
+++ b/
modules/roles/manifests/init.pp
@@
-39,6
+39,10
@@
class roles {
notify => Exec['service apache2 reload'],
key => true,
}
notify => Exec['service apache2 reload'],
key => true,
}
+ @ferm::rule { 'dsa-bugs-abusers':
+ prio => "005",
+ rule => "saddr (220.243.135/24 220.243.136/24) DROP",
+ }
}
if has_role('bugs_master') {
ssl::service { 'bugs-devel.debian.org': notify => Exec['service apache2 reload'], key => true, }
}
if has_role('bugs_master') {
ssl::service { 'bugs-devel.debian.org': notify => Exec['service apache2 reload'], key => true, }
@@
-157,6
+161,10
@@
class roles {
include named::primary
}
include named::primary
}
+ if has_role('dns_geo') {
+ include named::geodns
+ }
+
if has_role('weblog_destination') {
include roles::weblog_destination
}
if has_role('weblog_destination') {
include roles::weblog_destination
}
@@
-282,11
+290,15
@@
class roles {
include roles::snapshot_web
}
include roles::snapshot_web
}
+ if has_role('snapshot_shell') {
+ include roles::snapshot_shell
+ }
+
if has_role('veyepar.debian.org') {
if has_role('veyepar.debian.org') {
- ssl::service { 'veyepar.debian.org': notify => Exec['service apache2 reload'], key => true, }
+ include roles::veyepar
}
if has_role('sreview.debian.org') {
}
if has_role('sreview.debian.org') {
- ssl::service { 'sreview.debian.net': notify => Exec['service apache2 reload'], key => true, }
+ include roles::sreview
}
if has_role('debtags') {
}
if has_role('debtags') {
@@
-383,10
+395,7
@@
class roles {
include roles::anonscm
}
include roles::anonscm
}
- if has_role('kanboard') {
- include apache2
- package {'php-gd': ensure => installed }
- package {'php-pgsql': ensure => installed }
- package {'libapache2-mod-php': ensure => installed }
+ if has_role('loghost') {
+ include roles::loghost
}
}
}
}