[MediaWiki-commits] [Gerrit] Forward maniphest security extension to release/2016-02-18/2 - change (operations/puppet)

2016-02-17 Thread Dzahn (Code Review)
Dzahn has submitted this change and it was merged.

Change subject: Forward maniphest security extension to release/2016-02-18/2
..


Forward maniphest security extension to release/2016-02-18/2

Had to remove a file that conflicted with the update.

Also have to remove the event listener config to avoid
class-not-found exceptions.

Change-Id: Ib03d555817ecc6e83b54f8f796c881c5e3f3279a
---
M manifests/role/phabricator.pp
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index ae4d184..db7b72d 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -54,7 +54,7 @@
 mysql_admin_user => $role::phabricator::config::mysql_adminuser,
 mysql_admin_pass => $role::phabricator::config::mysql_adminpass,
 sprint_tag   => 'release/2016-02-18/1',
-security_tag => $current_tag,
+security_tag => 'release/2016-02-18/2',
 libraries=> ['/srv/phab/libext/Sprint/src',
 '/srv/phab/libext/security/src'],
 extension_tag=> 'release/2016-02-18/1',
@@ -76,7 +76,7 @@
 'metamta.reply-handler-domain'  => $domain,
 'repository.default-local-path' => '/srv/phab/repos',
 'phd.taskmasters'   => 10,
-'events.listeners'  => 
['SecurityPolicyEventListener'],
+'events.listeners'  => [],
 'diffusion.allow-http-auth' => true,
 'diffusion.ssh-host'=> 'git-ssh.wikimedia.org',
 },
@@ -221,7 +221,7 @@
 git_tag   => $current_tag,
 lock_file => '/var/run/phab_repo_lock',
 sprint_tag=> 'release/2016-02-18/1',
-security_tag  => $current_tag,
+security_tag  => 'release/2016-02-18/2',
 libraries => ['/srv/phab/libext/Sprint/src',
   '/srv/phab/libext/security/src'],
 extension_tag => 'release/2016-02-18/1',

-- 
To view, visit https://gerrit.wikimedia.org/r/271461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib03d555817ecc6e83b54f8f796c881c5e3f3279a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Forward maniphest security extension to release/2016-02-18/2 - change (operations/puppet)

2016-02-17 Thread 20after4 (Code Review)
20after4 has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/271461

Change subject: Forward maniphest security extension to release/2016-02-18/2
..

Forward maniphest security extension to release/2016-02-18/2

Had to remove a file that conflicted with the update.

Also have to remove the event listener config to avoid
class-not-found exceptions.

Change-Id: Ib03d555817ecc6e83b54f8f796c881c5e3f3279a
---
M manifests/role/phabricator.pp
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/61/271461/1

diff --git a/manifests/role/phabricator.pp b/manifests/role/phabricator.pp
index ae4d184..db7b72d 100644
--- a/manifests/role/phabricator.pp
+++ b/manifests/role/phabricator.pp
@@ -54,7 +54,7 @@
 mysql_admin_user => $role::phabricator::config::mysql_adminuser,
 mysql_admin_pass => $role::phabricator::config::mysql_adminpass,
 sprint_tag   => 'release/2016-02-18/1',
-security_tag => $current_tag,
+security_tag => 'release/2016-02-18/2',
 libraries=> ['/srv/phab/libext/Sprint/src',
 '/srv/phab/libext/security/src'],
 extension_tag=> 'release/2016-02-18/1',
@@ -76,7 +76,7 @@
 'metamta.reply-handler-domain'  => $domain,
 'repository.default-local-path' => '/srv/phab/repos',
 'phd.taskmasters'   => 10,
-'events.listeners'  => 
['SecurityPolicyEventListener'],
+'events.listeners'  => [],
 'diffusion.allow-http-auth' => true,
 'diffusion.ssh-host'=> 'git-ssh.wikimedia.org',
 },
@@ -221,7 +221,7 @@
 git_tag   => $current_tag,
 lock_file => '/var/run/phab_repo_lock',
 sprint_tag=> 'release/2016-02-18/1',
-security_tag  => $current_tag,
+security_tag  => 'release/2016-02-18/2',
 libraries => ['/srv/phab/libext/Sprint/src',
   '/srv/phab/libext/security/src'],
 extension_tag => 'release/2016-02-18/1',

-- 
To view, visit https://gerrit.wikimedia.org/r/271461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib03d555817ecc6e83b54f8f796c881c5e3f3279a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits