Rush has submitted this change and it was merged.
Change subject: phab update (and peripherals) for T78243
......................................................................
phab update (and peripherals) for T78243
* Sprint app
* Security extension (large refactor)
* Upstream changes
Change-Id: Ib5249dc4aecfc8ce5df709b080a8fcf7dee697e0
---
M manifests/role/phabricator.pp
M modules/phabricator/data/fixed_settings.yaml
2 files changed, 11 insertions(+), 12 deletions(-)
Approvals:
Rush: Verified; Looks good to me, approved
20after4: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index 878abf8..a68448b 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -55,7 +55,7 @@
}
#let's go jenkins
- $current_tag = 'T77082'
+ $current_tag = 'release/2015-01-08/1'
$domain = 'phabricator.wikimedia.org'
$altdom = 'phab.wmfusercontent.org'
$mysql_host = 'm3-master.eqiad.wmnet'
@@ -66,13 +66,13 @@
mysql_admin_user => $role::phabricator::config::mysql_adminuser,
mysql_admin_pass => $role::phabricator::config::mysql_adminpass,
auth_type => 'dual',
- sprint_tag => '0.6.1.4',
- security_tag => 'T518.1',
- libraries => ['/srv/phab/libext/Sprint/src'],
+ sprint_tag => 'release/2015-01-08/1',
+ security_tag => 'release/2015-01-13/1',
+ libraries => ['/srv/phab/libext/Sprint/src',
+ '/srv/phab/libext/security/src'],
extension_tag => 'HEAD',
extensions => [ 'MediaWikiUserpageCustomField.php',
- 'LDAPUserpageCustomField.php',
- 'SecurityPolicyEnforcerAction.php'],
+ 'LDAPUserpageCustomField.php'],
settings => {
'search.elastic.host' =>
'http://search.svc.eqiad.wmnet:9200',
'search.elastic.namespace' => 'phabricatormain',
@@ -91,6 +91,7 @@
'metamta.reply-handler-domain' => $domain,
'repository.default-local-path' => '/srv/phab/repos',
'phd.start-taskmasters' => 10,
+ 'events.listeners' =>
['SecurityPolicyEventListener'],
},
}
@@ -177,17 +178,18 @@
#pass not sensitive but has to match phab and db
$mysqlpass = 'labspass'
- $current_tag = 'T77082'
+ $current_tag = 'release/2015-01-08/1'
class { '::phabricator':
git_tag => $current_tag,
lock_file => '/var/run/phab_repo_lock',
auth_type => 'local',
- libext_tag => '0.6.1.4',
+ sprint_tag => 'release/2015-01-08/1',
libraries => {
'sprint' => '/srv/phab/libext/Sprint/src',
},
extension_tag => 'HEAD',
- extensions => ['SecurityPolicyEnforcerAction.php'],
+ extensions => [ 'MediaWikiUserpageCustomField.php',
+ 'LDAPUserpageCustomField.php'],
settings => {
'search.elastic.host' => 'http://localhost:9200',
'search.elastic.namespace' => 'phabricator',
diff --git a/modules/phabricator/data/fixed_settings.yaml
b/modules/phabricator/data/fixed_settings.yaml
index 9c39956..b299c20 100644
--- a/modules/phabricator/data/fixed_settings.yaml
+++ b/modules/phabricator/data/fixed_settings.yaml
@@ -88,9 +88,6 @@
#ops-sensitive: 'Operations Sensitive'
#sensitive: 'Another Private Issue'
-# Disabled temporarily
-#events.listeners: ['SecurityPolicyEventListener']
-
maniphest.statuses:
open:
name: Open
--
To view, visit https://gerrit.wikimedia.org/r/184802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5249dc4aecfc8ce5df709b080a8fcf7dee697e0
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: 20after4 <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
