[MediaWiki-commits] [Gerrit] Beta parsoid conf is now in deploy repo - change (integration/config)

2014-12-18 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

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

Change subject: Beta parsoid conf is now in deploy repo
..

Beta parsoid conf is now in deploy repo

We used to provide Parsoid settings via puppet and creating a symlink
for the service to find it.  Nowadays, the settings are maintained in
the deploy repo directly:

/srv/deployment/parsoid/deploy/conf/wmf/betalabs.localsettings.js

Subbu confirmed the Parsoid upstart loads that file.

Delete obsolete localsettings.js link.

Change-Id: I56cee82d0eff87912a6046faafb06426f5e5b57d
---
M jjb/beta.yaml
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/83/180783/1

diff --git a/jjb/beta.yaml b/jjb/beta.yaml
index 84919bd..ebd86be 100644
--- a/jjb/beta.yaml
+++ b/jjb/beta.yaml
@@ -249,8 +249,6 @@
  RSYNC_OPTS=--update --times --recursive --links --delete-after 
--delay-updates
  rsync $RSYNC_OPTS $WORKSPACE/parsoid $PARSOID_TARGET
  rsync $RSYNC_OPTS $WORKSPACE/deploy $PARSOID_TARGET
- # Configuration file is managed by puppet
- ln -s /srv/deployment/parsoid/localsettings.js 
$PARSOID_TARGET/parsoid/api/localsettings.js
 
  - shell: |
  sudo /etc/init.d/parsoid restart

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56cee82d0eff87912a6046faafb06426f5e5b57d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr

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

[MediaWiki-commits] [Gerrit] Beta parsoid conf is now in deploy repo - change (integration/config)

2014-12-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Beta parsoid conf is now in deploy repo
..


Beta parsoid conf is now in deploy repo

We used to provide Parsoid settings via puppet and creating a symlink
for the service to find it.  Nowadays, the settings are maintained in
the deploy repo directly:

/srv/deployment/parsoid/deploy/conf/wmf/betalabs.localsettings.js

Subbu confirmed the Parsoid upstart loads that file.

Delete obsolete localsettings.js link.

Change-Id: I56cee82d0eff87912a6046faafb06426f5e5b57d
---
M jjb/beta.yaml
1 file changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Subramanya Sastry: Looks good to me, but someone else must approve
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/beta.yaml b/jjb/beta.yaml
index 84919bd..ebd86be 100644
--- a/jjb/beta.yaml
+++ b/jjb/beta.yaml
@@ -249,8 +249,6 @@
  RSYNC_OPTS=--update --times --recursive --links --delete-after 
--delay-updates
  rsync $RSYNC_OPTS $WORKSPACE/parsoid $PARSOID_TARGET
  rsync $RSYNC_OPTS $WORKSPACE/deploy $PARSOID_TARGET
- # Configuration file is managed by puppet
- ln -s /srv/deployment/parsoid/localsettings.js 
$PARSOID_TARGET/parsoid/api/localsettings.js
 
  - shell: |
  sudo /etc/init.d/parsoid restart

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56cee82d0eff87912a6046faafb06426f5e5b57d
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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