Dzahn has submitted this change and it was merged.
Change subject: remove deprecated legalpad.wm service
......................................................................
remove deprecated legalpad.wm service
This service, legalpad.wikimedia.org, has been deprecated.
It has been replaced by the legalpad app within the regular production
phabricator instance.
T87688
Change-Id: If22b46720828e7e545cacf5a03c9393d5a081de2
---
M manifests/role/phabricator.pp
M manifests/site.pp
M templates/varnish/misc.inc.vcl.erb
3 files changed, 0 insertions(+), 40 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 90caeb1..a1f4ecd 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -9,42 +9,6 @@
$mysql_maniphestuser = $passwords::mysql::phabricator::manifest_user
$mysql_maniphestpass = $passwords::mysql::phabricator::manifest_pass
}
-# phabricator instance for legalpad.wikimedia.org
-class role::phabricator::legalpad {
- include role::phabricator::config
-
- system::role { 'role::phabricator::legalpad':
- description => 'Phabricator (Legalpad)'
- }
-
- $current_tag = 'fabT440'
- class { '::phabricator':
- git_tag => $current_tag,
- lock_file => '/var/run/phab_repo_lock',
- mysql_admin_user =>
$role::phabricator::config::mysql_adminuser,
- mysql_admin_pass =>
$role::phabricator::config::mysql_adminpass,
- auth_type => 'sul',
- settings => {
- 'darkconsole.enabled' => false,
- 'phabricator.base-uri' => 'https://legalpad.wikimedia.org',
- 'mysql.user' =>
$role::phabricator::config::mysql_appuser,
- 'mysql.pass' =>
$role::phabricator::config::mysql_apppass,
- 'mysql.host' => 'm3-master.eqiad.wmnet',
- 'storage.default-namespace' => 'phlegal',
- 'phpmailer.smtp-host' =>
- inline_template('<%= @mail_smarthost.join(";") %>'),
- 'metamta.default-address' =>
- '[email protected]',
- 'metamta.domain' => 'legalpad.wikimedia.org',
- },
- }
-
- # no 443 needed, we are behind misc. varnish
- ferm::service { 'phablegal_http':
- proto => 'tcp',
- port => '80',
- }
-}
# production phabricator instance
class role::phabricator::main {
diff --git a/manifests/site.pp b/manifests/site.pp
index 52ed424..7b9db6e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2076,8 +2076,6 @@
node 'radon.eqiad.wmnet' {
class { 'base::firewall': }
- role phabricator::legalpad
-
include admin
include standard
}
diff --git a/templates/varnish/misc.inc.vcl.erb
b/templates/varnish/misc.inc.vcl.erb
index 3545e87..7af9076 100644
--- a/templates/varnish/misc.inc.vcl.erb
+++ b/templates/varnish/misc.inc.vcl.erb
@@ -24,8 +24,6 @@
set req.backend = zirconium;
} elsif (req.http.Host == "parsoid-tests.wikimedia.org") {
set req.backend = ruthenium;
- } elsif (req.http.Host == "legalpad.wikimedia.org") {
- set req.backend = radon;
} elsif (req.http.Host == "phabricator.wikimedia.org" || req.http.Host
== "phab.wmfusercontent.org" || req.http.Host == "bugzilla.wikimedia.org" ||
req.http.Host == "bugs.wikimedia.org") {
set req.backend = iridium;
} elsif (req.http.Host == "old-bugzilla.wikimedia.org" || req.http.Host
== "static-bugzilla.wikimedia.org" || req.http.Host ==
"bug-attachment.wikimedia.org" || req.http.Host =="dev.wikimedia.org") {
--
To view, visit https://gerrit.wikimedia.org/r/187050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If22b46720828e7e545cacf5a03c9393d5a081de2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
