Merge pull request ether#2 from ariddell/feature/allow-root

Allow running etherpad as root with env var (thanks ariddell)

README.md

@@ -17,6 +17,17 @@ heroku config:add ETHERPAD_SETTINGS=settingsJSONinroot.json
 5. Add your Heroku app as a remote
 6. `git push heroku master`
 
+
+## additional settings
+
+Etherpad will complain if you run it as root. If you wish to allow it to run as
+root, set an additional config variable:
+
+```bash
+heroku config:add ETHERPAD_ALLOW_ROOT=1
+```
+
+
 ## TODO
 
 - <del>Plugin support</del> Works.

preparse.rb

@@ -22,4 +22,8 @@
 # Write the settings hash out as JSON.
 File.open('./etherpad-lite/settings.json', 'w') { |f| f.write(settings.to_json) }
 
+if ENV['ETHERPAD_ALLOW_ROOT'] == '1'
+exec('./etherpad-lite/bin/run.sh --root')
+else
 exec('./etherpad-lite/bin/run.sh')
+end