Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186601
Change subject: scap: Move rsync proxies into module
......................................................................
scap: Move rsync proxies into module
It was mistakenly put in the deployment module (which afaik
does not actually deal with scap at all) in
I22dd6d44a4574f679451a606fab7750e7345bb6c. This moves it to
the scap module instead
Bug: T87221
Change-Id: Ic74c6c7ddfd85e4db083db2c307e3dcbecadc88e
---
M manifests/misc/deployment.pp
M manifests/role/mediawiki.pp
R modules/scap/manifests/proxy.pp
3 files changed, 4 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/01/186601/1
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index eafc33f..f65e5ef 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -73,13 +73,3 @@
}
}
-class misc::deployment::scap_proxy {
- include rsync::server
- include network::constants
-
- rsync::server::module { 'common':
- path => '/srv/mediawiki',
- read_only => 'true',
- hosts_allow => $::network::constants::mw_appserver_networks;
- }
-}
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index c78c09e..db5e653 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -51,7 +51,7 @@
$scap_proxies = hiera('dsh::config::scap_proxies',[])
if member($scap_proxies, $::fqdn) {
- include deployment::scap_proxy
+ include scap::proxy
}
}
diff --git a/modules/deployment/manifests/scap_proxy.pp
b/modules/scap/manifests/proxy.pp
similarity index 71%
rename from modules/deployment/manifests/scap_proxy.pp
rename to modules/scap/manifests/proxy.pp
index 2bd59bb..794ce7d 100644
--- a/modules/deployment/manifests/scap_proxy.pp
+++ b/modules/scap/manifests/proxy.pp
@@ -1,7 +1,7 @@
-# === Class deployment::scap_proxy
+# = class: scap::proxy
#
-# Sets up a scap proxy server.
-class deployment::scap_proxy {
+# Sets up an rsync proxy for scap
+class scap::proxy {
include rsync::server
include network::constants
--
To view, visit https://gerrit.wikimedia.org/r/186601
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic74c6c7ddfd85e4db083db2c307e3dcbecadc88e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
