[MediaWiki-commits] [Gerrit] install_server: Use PRODUCTION_NETWORKS - change (operations/puppet)

2016-06-25 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: install_server: Use PRODUCTION_NETWORKS
..


install_server: Use PRODUCTION_NETWORKS

Only used to install systems in the production networks.

Change-Id: Ia26316bc1060cf480bbc1052c620c7a898297c91
---
M manifests/role/installserver.pp
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp
index 215fc61..eb85526 100644
--- a/manifests/role/installserver.pp
+++ b/manifests/role/installserver.pp
@@ -36,7 +36,7 @@
 
 include install_server::tftp_server
 ferm::rule { 'tftp':
-rule => 'proto udp dport tftp { saddr $ALL_NETWORKS ACCEPT; }'
+rule => 'proto udp dport tftp { saddr $PRODUCTION_NETWORKS ACCEPT; }'
 }
 
 if os_version('ubuntu >= trusty') or os_version('debian >= jessie') {
@@ -58,7 +58,7 @@
 }
 
 ferm::rule { 'proxy':
-rule => 'proto tcp dport 8080 { saddr $ALL_NETWORKS ACCEPT; }'
+rule => 'proto tcp dport 8080 { saddr $PRODUCTION_NETWORKS ACCEPT; }'
 }
 
 include install_server::web_server
@@ -73,7 +73,7 @@
 
 include install_server::dhcp_server
 ferm::rule { 'dhcp':
-rule => 'proto udp dport bootps { saddr $ALL_NETWORKS ACCEPT; }'
+rule => 'proto udp dport bootps { saddr $PRODUCTION_NETWORKS ACCEPT; }'
 }
 
 # Backup

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia26316bc1060cf480bbc1052c620c7a898297c91
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] install_server: Use PRODUCTION_NETWORKS - change (operations/puppet)

2016-06-24 Thread Muehlenhoff (Code Review) 
Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295784

Change subject: install_server: Use PRODUCTION_NETWORKS
..

install_server: Use PRODUCTION_NETWORKS

Only used to install systems in the production networks.

Change-Id: Ia26316bc1060cf480bbc1052c620c7a898297c91
---
M manifests/role/installserver.pp
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/295784/1

diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp
index 215fc61..eb85526 100644
--- a/manifests/role/installserver.pp
+++ b/manifests/role/installserver.pp
@@ -36,7 +36,7 @@
 
 include install_server::tftp_server
 ferm::rule { 'tftp':
-rule => 'proto udp dport tftp { saddr $ALL_NETWORKS ACCEPT; }'
+rule => 'proto udp dport tftp { saddr $PRODUCTION_NETWORKS ACCEPT; }'
 }
 
 if os_version('ubuntu >= trusty') or os_version('debian >= jessie') {
@@ -58,7 +58,7 @@
 }
 
 ferm::rule { 'proxy':
-rule => 'proto tcp dport 8080 { saddr $ALL_NETWORKS ACCEPT; }'
+rule => 'proto tcp dport 8080 { saddr $PRODUCTION_NETWORKS ACCEPT; }'
 }
 
 include install_server::web_server
@@ -73,7 +73,7 @@
 
 include install_server::dhcp_server
 ferm::rule { 'dhcp':
-rule => 'proto udp dport bootps { saddr $ALL_NETWORKS ACCEPT; }'
+rule => 'proto udp dport bootps { saddr $PRODUCTION_NETWORKS ACCEPT; }'
 }
 
 # Backup

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

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

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