Mwalker has submitted this change and it was merged.
Change subject: Upstart Script and User Configuration
......................................................................
Upstart Script and User Configuration
* Boilerplate upstart script that can be linked into /etc/init
* Updates to configuration initialization; can now read from
a user configurable file that's not version controlled.
Change-Id: I4b569cea08bc46f06377cb1e7af65e325a40a86c
---
M README.md
A mw-collection-ocg.conf
M mw-collection-ocg.js
3 files changed, 33 insertions(+), 6 deletions(-)
Approvals:
Mwalker: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/README.md b/README.md
index b5b1652..b9d1742 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,8 @@
-Ubuntu Dependencies
--- redis-server
\ No newline at end of file
+Installation on Ubuntu
+----------------------
+
+ln -s <repodir>/mw-collection-ocg.conf /etc/init
+initctl reload-configuration
+service mw-collection-ocg start
+
+
diff --git a/mw-collection-ocg.conf b/mw-collection-ocg.conf
new file mode 100644
index 0000000..3a6859e
--- /dev/null
+++ b/mw-collection-ocg.conf
@@ -0,0 +1,21 @@
+# vim: set ft=upstart:
+
+# Upstart configuration file for the MediaWiki Collection extension OCG
+# To use:
+# # ln -s <location of this file> /etc/init
+# # initctl reload-configuration
+# # service mw-collection-ocg start
+# Check to see if valid output is being generated to syslog
+
+description "MediaWiki Collection Offline Content Generator"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [!2345]
+
+script
+ BINDIR=`readlink /etc/init/mw-collection-ocg.conf`
+ BINDIR=`dirname $BINDIR`
+ $BINDIR/mw-collection-ocg.js
+end script
+
+respawn
diff --git a/mw-collection-ocg.js b/mw-collection-ocg.js
index 86727aa..5e2f53a 100755
--- a/mw-collection-ocg.js
+++ b/mw-collection-ocg.js
@@ -41,13 +41,13 @@
nconf
.argv({
c: {
- alias: 'config=file',
+ alias: 'config-file',
describe: 'Local configuration file',
- default: '/etc/collectoid.json'
+ default: '/etc/mw-collection-ocg.json'
}
})
- .file({file: nconf.get('config=file')})
- .file({file: 'defaults.json'});
+ .file({file: nconf.get('config-file')})
+ .defaults(require('./defaults.json'));
/* === Initial Logging ===================================================== */
console.set({
--
To view, visit https://gerrit.wikimedia.org/r/96461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b569cea08bc46f06377cb1e7af65e325a40a86c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator
Gerrit-Branch: master
Gerrit-Owner: Mwalker <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
