Subramanya Sastry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/249399
Change subject: WIP: Update parsoid server.js path + removed stale parsoid file
......................................................................
WIP: Update parsoid server.js path + removed stale parsoid file
* This should not be deployed to the production cluster until
new parsoid code is deployed first (we have a symlink in place
so the old puppet paths continue to work).
* The stale parsoid file references circa 2013 parsoid extension
code which is long gone.
Change-Id: I9948b5caabe7c63b22c3f96b49c5ec31070b907f
---
D files/misc/parsoid
M files/misc/parsoid.upstart
2 files changed, 1 insertion(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/99/249399/1
diff --git a/files/misc/parsoid b/files/misc/parsoid
deleted file mode 100644
index 0e0b2e3..0000000
--- a/files/misc/parsoid
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/bash
-
-#####################################################################
-### THIS FILE IS MANAGED BY PUPPET
-### puppet:///files/misc/parsoid
-#####################################################################
-
-# Script to start Parsoid
-
-(
- cd /var/lib/parsoid/Parsoid/js/lib
- export NODE_PATH=/var/lib/parsoid/Parsoid/js/lib/node_modules
- sudo -E -u parsoid nohup node /var/lib/parsoid/Parsoid/js/api/server.js
> /var/lib/parsoid/nohup.out 2>&1 &
- PARSOIDPID=$!
- echo $PARSOIDPID > /var/run/parsoid.pid
- wait $PARSOIDPID
- rm /var/run/parsoid.pid
-) &
diff --git a/files/misc/parsoid.upstart b/files/misc/parsoid.upstart
index ea4db42..24f1bca 100644
--- a/files/misc/parsoid.upstart
+++ b/files/misc/parsoid.upstart
@@ -37,5 +37,5 @@
fi
DAEMON_ARGS="-c $PARSOID_SETTINGS_FILE"
chdir "$PARSOID_BASE_PATH"
- exec /usr/bin/nodejs api/server.js $DAEMON_ARGS < /dev/null >>
"$PARSOID_LOG_FILE" 2>&1
+ exec /usr/bin/nodejs bin/server.js $DAEMON_ARGS < /dev/null >>
"$PARSOID_LOG_FILE" 2>&1
end script
--
To view, visit https://gerrit.wikimedia.org/r/249399
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9948b5caabe7c63b22c3f96b49c5ec31070b907f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Subramanya Sastry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
