[MediaWiki-commits] [Gerrit] operations/puppet[production]: archiva: move standard include, use profile::b::firewall

2017-11-22 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392770 )

Change subject: archiva: move standard include, use profile::b::firewall
..


archiva: move standard include, use profile::b::firewall

Change-Id: Ic03480d849a8a31413ebeace787411054f86994b
---
M manifests/site.pp
M modules/role/manifests/archiva.pp
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 550e5b3..965094c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1550,7 +1550,6 @@
 # archiva.wikimedia.org
 node 'meitnerium.wikimedia.org' {
 role(archiva)
-include ::standard
 }
 
 # OTRS - ticket.wikimedia.org
diff --git a/modules/role/manifests/archiva.pp 
b/modules/role/manifests/archiva.pp
index 8ec1c4a..5d3aebe 100644
--- a/modules/role/manifests/archiva.pp
+++ b/modules/role/manifests/archiva.pp
@@ -7,7 +7,8 @@
 class role::archiva {
 system::role { 'archiva': description => 'Apache Archiva Host' }
 
-include ::base::firewall
+include ::standard
+include ::profile::base::firewall
 
 require_package('openjdk-7-jdk')
 

-- 
To view, visit https://gerrit.wikimedia.org/r/392770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic03480d849a8a31413ebeace787411054f86994b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: archiva: move standard include, use profile::b::firewall

2017-11-21 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392770 )

Change subject: archiva: move standard include, use profile::b::firewall
..

archiva: move standard include, use profile::b::firewall

Change-Id: Ic03480d849a8a31413ebeace787411054f86994b
---
M manifests/site.pp
M modules/role/manifests/archiva.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/70/392770/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 1a8ebb3..f0309d9 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1552,7 +1552,6 @@
 # archiva.wikimedia.org
 node 'meitnerium.wikimedia.org' {
 role(archiva)
-include ::standard
 }
 
 # OTRS - ticket.wikimedia.org
diff --git a/modules/role/manifests/archiva.pp 
b/modules/role/manifests/archiva.pp
index 8ec1c4a..5d3aebe 100644
--- a/modules/role/manifests/archiva.pp
+++ b/modules/role/manifests/archiva.pp
@@ -7,7 +7,8 @@
 class role::archiva {
 system::role { 'archiva': description => 'Apache Archiva Host' }
 
-include ::base::firewall
+include ::standard
+include ::profile::base::firewall
 
 require_package('openjdk-7-jdk')
 

-- 
To view, visit https://gerrit.wikimedia.org/r/392770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic03480d849a8a31413ebeace787411054f86994b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits