Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/379185 )
Change subject: Remove deployment::redis ferm service
......................................................................
Remove deployment::redis ferm service
The underlying service was removed in 8d7cb3b8183e11760f4736cc84000c04db439360,
so also remove the ferm configuration.
Also clean up a few comments which refer to Trebuchet, but are actually
applicable in general.
Change-Id: Ie0321eea635e23782298e3fd10720e7840f8c4ab
---
M modules/profile/manifests/mediawiki/deployment/server.pp
1 file changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/85/379185/1
diff --git a/modules/profile/manifests/mediawiki/deployment/server.pp
b/modules/profile/manifests/mediawiki/deployment/server.pp
index a869d36..d9c1f6a 100644
--- a/modules/profile/manifests/mediawiki/deployment/server.pp
+++ b/modules/profile/manifests/mediawiki/deployment/server.pp
@@ -57,7 +57,7 @@
# T113351
ferm::service { 'http_deployment_server':
- desc => 'http on trebuchet deployment servers, for serving actual
files to deploy',
+ desc => 'HTTP on deployment servers, for serving actual files to
deploy',
proto => 'tcp',
port => '80',
srange => "(${deployable_networks_ferm})",
@@ -76,7 +76,6 @@
# Also make sure that no files have been stolen by root ;-)
::monitoring::icinga::bad_directory_owner { '/srv/mediawiki-staging': }
- ### Trebuchet
file { '/srv/deployment':
ensure => directory,
owner => 'trebuchet',
@@ -117,13 +116,6 @@
# Bacula backups (T125527)
backup::set { 'srv-deployment': }
- # Used by the trebuchet salt returner
- ferm::service { 'deployment-redis':
- proto => 'tcp',
- port => '6379',
- srange => "(${deployable_networks_ferm})",
- }
-
sudo::group { "${deployment_group}_deployment_server":
group => $deployment_group,
privileges => [
@@ -133,7 +125,6 @@
'ALL = (root) NOPASSWD: /usr/bin/salt-call -l quiet --out=json
publish.runner deploy.restart *',
],
}
- ### End Trebuchet
# tig is a ncurses-based git utility which is useful for
# determining the state of git repos during deployments.
--
To view, visit https://gerrit.wikimedia.org/r/379185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0321eea635e23782298e3fd10720e7840f8c4ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
