Andrew Bogott has submitted this change and it was merged.
Change subject: Remove misc::deployment::scap_proxy as it appears unused.
......................................................................
Remove misc::deployment::scap_proxy as it appears unused.
Also removed a conf file that it used.
Change-Id: Ia792a461778e726ffa2473e5224a8431e7e0e72a
---
D files/rsync/rsyncd.conf.scap
M manifests/misc/deployment.pp
2 files changed, 0 insertions(+), 15 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/rsync/rsyncd.conf.scap b/files/rsync/rsyncd.conf.scap
deleted file mode 100644
index 211c030..0000000
--- a/files/rsync/rsyncd.conf.scap
+++ /dev/null
@@ -1,11 +0,0 @@
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/rsync/rsyncd.conf.scap
-#####################################################################
-
-hosts allow = 10.0.0.0/16 10.64.0.0/22 10.64.16.0/24 208.80.152.0/24
-
-[common]
-read only=true
-path=/usr/local/apache/common-local
-
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index d57a25d..95f1efe 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -385,7 +385,3 @@
class misc::deployment::scap_primary {
class { 'generic::rsyncd': config => "scap-primary" }
}
-
-class misc::deployment::scap_proxy {
- class { 'generic::rsyncd': config => "scap" }
-}
--
To view, visit https://gerrit.wikimedia.org/r/71122
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia792a461778e726ffa2473e5224a8431e7e0e72a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
