Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/73521
Change subject: Remove uses of the 'firewall' module.
......................................................................
Remove uses of the 'firewall' module.
We don't use this module in our repository, and references were
breaking tests.
Change-Id: I795284300537275de2382317e6c361d55f9d547b
---
M modules/apache/manifests/vhost.pp
M modules/apache/manifests/vhost/redirect.pp
2 files changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/73521/1
diff --git a/modules/apache/manifests/vhost.pp
b/modules/apache/manifests/vhost.pp
index 7323f7e..8aef176 100644
--- a/modules/apache/manifests/vhost.pp
+++ b/modules/apache/manifests/vhost.pp
@@ -44,7 +44,7 @@
$docroot_dir_allows = ['all'],
$docroot_dir_denies = '',
$serveradmin = false,
- $configure_firewall = true,
+ $configure_firewall = false,
$ssl = $apache::params::ssl,
$template = $apache::params::template,
$priority = $apache::params::priority,
diff --git a/modules/apache/manifests/vhost/redirect.pp
b/modules/apache/manifests/vhost/redirect.pp
index c581ab4..f1fe4fa 100644
--- a/modules/apache/manifests/vhost/redirect.pp
+++ b/modules/apache/manifests/vhost/redirect.pp
@@ -44,14 +44,5 @@
require => Package['httpd'],
notify => Service['httpd'],
}
-
- if ! defined(Firewall["0100-INPUT ACCEPT $port"]) {
- @firewall {
- "0100-INPUT ACCEPT $port":
- jump => 'ACCEPT',
- dport => '$port',
- proto => 'tcp'
- }
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/73521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I795284300537275de2382317e6c361d55f9d547b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
