diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
| commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
| tree | 1d19df6405103577d872902486792e8c23bce711 /INSTALL | |
| parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
| parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
| download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.bz2 etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip | |
Merge remote branch 'upstream/master'
Conflicts:
etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
etherpad/src/etherpad/control/pro/pro_main_control.js
etherpad/src/etherpad/control/pro_help_control.js
etherpad/src/etherpad/globals.js
etherpad/src/etherpad/legacy_urls.js
etherpad/src/etherpad/pne/pne_utils.js
etherpad/src/etherpad/pro/pro_utils.js
etherpad/src/main.js
etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
etherpad/src/plugins/testplugin/templates/page.ejs
etherpad/src/static/css/pad2_ejs.css
etherpad/src/static/css/pro-help.css
etherpad/src/static/img/jun09/pad/protop.gif
etherpad/src/static/js/store.js
etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
etherpad/src/themes/default/templates/main/home.ejs
etherpad/src/themes/default/templates/pro-help/main.ejs
etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
infrastructure/com.etherpad/licensing.scala
trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
trunk/etherpad/src/static/css/home-opensource.css
trunk/etherpad/src/static/js/ace.js
trunk/etherpad/src/static/js/linestylefilter_client.js
trunk/etherpad/src/templates/email/eepnet_license_info.ejs
trunk/etherpad/src/templates/pad/pad_body2.ejs
trunk/etherpad/src/templates/pad/pad_content.ejs
trunk/etherpad/src/templates/pad/padfull_body.ejs
trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
Diffstat (limited to 'INSTALL')
| -rw-r--r-- | INSTALL | 31 |
1 files changed, 31 insertions, 0 deletions
@@ -0,0 +1,31 @@ +Installation instructions: + +* Install the dependencies: Scala 2.7, Sun Java JDK 6, libmysql-java + +* Uninstall gcj if it's installed as it seems to interfere with the + Scala compiler. You can safely reinstall it after compiling Etherpad + if you want to. + +* Edit the files bin/build.sh and bin/run.sh (and optionally + bin/etherpad.init.d) and change the paths to match your system. + +* Run bin/build.sh + +* Create a new user on your system called "etherpad" + +* Create a MySQL database "etherpad" and a database user "etherpad" + +* Copy etherpad/etc/etherpad.localdev-default.properties to etherpad/etc/etherpad.local.properties + +* Edit etherpad/etc/etherpad.local.properties and set + etherpad.SQL_JDBC_URL + Example etherpad.SQL_JDBC_URL = jdbc:mysql://localhost:3306/etherpad + etherpad.SQL_PASSWORD + etherpad.SQL_USERNAME = etherpad + etherpad.adminPass + topdomains + Example: topdomains = yourhostname.com,localhost + +* Create a link to bin/etherpad.init.d from /etc/init.d/etherpad + +* Run /etc/init.d/etherpad start |