[MediaWiki-commits] [Gerrit] subversion: move ferm rules from module to role - change (operations/puppet)

2014-04-28 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has submitted this change and it was merged.

Change subject: subversion: move ferm rules from module to role
..


subversion: move ferm rules from module to role

Change-Id: I63feb5c0a2e34c35eb21731c440e7252bf8e9cd9
---
M manifests/role/subversion.pp
M modules/subversion/manifests/init.pp
2 files changed, 10 insertions(+), 7 deletions(-)

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



diff --git a/manifests/role/subversion.pp b/manifests/role/subversion.pp
index 3c26c82..5a91f0f 100644
--- a/manifests/role/subversion.pp
+++ b/manifests/role/subversion.pp
@@ -11,6 +11,16 @@
 host => $svnhost,
 }
 
+ferm::service { 'http':
+proto => 'tcp',
+port  => '80'
+}
+
+ferm::service { 'https':
+proto => 'tcp',
+port  => '443'
+}
+
 monitor_service { 'https':
 description   => 'HTTPS',
 check_command => "check_ssl_cert!${svnhost}",
diff --git a/modules/subversion/manifests/init.pp 
b/modules/subversion/manifests/init.pp
index c5f116a..9e75bc9 100644
--- a/modules/subversion/manifests/init.pp
+++ b/modules/subversion/manifests/init.pp
@@ -56,13 +56,6 @@
 
 apache_module { 'authz_svn': name => 'authz_svn' }
 
-ferm::rule { 'svn_80':
-rule => 'proto tcp dport 80 ACCEPT;'
-}
-ferm::rule { 'svn_443':
-rule => 'proto tcp dport 443 ACCEPT;'
-}
-
 exec { '/usr/bin/svn co file:///svnroot/mediawiki/USERINFO svnusers':
 creates => '/var/cache/svnusers/.svn',
 cwd => '/var/cache',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I63feb5c0a2e34c35eb21731c440e7252bf8e9cd9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Matanya 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] subversion: move ferm rules from module to role - change (operations/puppet)

2014-04-27 Thread Matanya (Code Review) 
Matanya has uploaded a new change for review.

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

Change subject: subversion: move ferm rules from module to role
..

subversion: move ferm rules from module to role

Change-Id: I63feb5c0a2e34c35eb21731c440e7252bf8e9cd9
---
M manifests/role/subversion.pp
M modules/subversion/manifests/init.pp
2 files changed, 10 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/65/129965/1

diff --git a/manifests/role/subversion.pp b/manifests/role/subversion.pp
index 3c26c82..5a91f0f 100644
--- a/manifests/role/subversion.pp
+++ b/manifests/role/subversion.pp
@@ -11,6 +11,16 @@
 host => $svnhost,
 }
 
+ferm::service { 'http':
+proto => 'tcp',
+port  => '80'
+}
+
+ferm::service { 'https':
+proto => 'tcp',
+port  => '443'
+}
+
 monitor_service { 'https':
 description   => 'HTTPS',
 check_command => "check_ssl_cert!${svnhost}",
diff --git a/modules/subversion/manifests/init.pp 
b/modules/subversion/manifests/init.pp
index c5f116a..9e75bc9 100644
--- a/modules/subversion/manifests/init.pp
+++ b/modules/subversion/manifests/init.pp
@@ -56,13 +56,6 @@
 
 apache_module { 'authz_svn': name => 'authz_svn' }
 
-ferm::rule { 'svn_80':
-rule => 'proto tcp dport 80 ACCEPT;'
-}
-ferm::rule { 'svn_443':
-rule => 'proto tcp dport 443 ACCEPT;'
-}
-
 exec { '/usr/bin/svn co file:///svnroot/mediawiki/USERINFO svnusers':
 creates => '/var/cache/svnusers/.svn',
 cwd => '/var/cache',

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

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

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