Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391723 )
Change subject: etherpad,ganglia,tor_relay: use profile::base::firewall
......................................................................
etherpad,ganglia,tor_relay: use profile::base::firewall
Change-Id: I67edcc73f755fe9dcf7b3fec85a84da373af5c61
---
M modules/profile/manifests/etherpad.pp
M modules/role/manifests/etherpad.pp
M modules/role/manifests/ganglia/web.pp
M modules/role/manifests/tor_relay.pp
4 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/profile/manifests/etherpad.pp
b/modules/profile/manifests/etherpad.pp
index 10f1ae0..6bec24c 100644
--- a/modules/profile/manifests/etherpad.pp
+++ b/modules/profile/manifests/etherpad.pp
@@ -1,7 +1,6 @@
# sets up an Etherpad lite server
class profile::etherpad {
- include ::base::firewall
include ::passwords::etherpad_lite
class { '::etherpad':
diff --git a/modules/role/manifests/etherpad.pp
b/modules/role/manifests/etherpad.pp
index e420219..2ec53e8 100644
--- a/modules/role/manifests/etherpad.pp
+++ b/modules/role/manifests/etherpad.pp
@@ -4,5 +4,6 @@
system::role { 'etherpad': description => 'Etherpad-lite server' }
include ::standard
+ include ::profile::base::firewall
include ::profile::etherpad
}
diff --git a/modules/role/manifests/ganglia/web.pp
b/modules/role/manifests/ganglia/web.pp
index 86440db..f262e89 100644
--- a/modules/role/manifests/ganglia/web.pp
+++ b/modules/role/manifests/ganglia/web.pp
@@ -1,6 +1,6 @@
# A role that includes all the needed stuff to run a ganglia web frontend
class role::ganglia::web {
- include ::base::firewall
+ include ::profile::base::firewall
include ::standard
include role::ganglia::config
include role::ganglia::views
diff --git a/modules/role/manifests/tor_relay.pp
b/modules/role/manifests/tor_relay.pp
index 651b115..387c1c5 100644
--- a/modules/role/manifests/tor_relay.pp
+++ b/modules/role/manifests/tor_relay.pp
@@ -1,7 +1,7 @@
# set up a Tor relay (https://www.torproject.org/)
class role::tor_relay {
include ::standard
- include ::base::firewall
+ include ::profile::base::firewall
include ::profile::tor::relay
system::role { 'tor_relay':
--
To view, visit https://gerrit.wikimedia.org/r/391723
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67edcc73f755fe9dcf7b3fec85a84da373af5c61
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
