diff --git a/Dockerfile b/Dockerfile index e16e5817..93544856 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,4 +51,4 @@ COPY --chown=etherpad:0 ./settings.json.docker /opt/etherpad-lite/settings.json RUN chmod -R g=u . EXPOSE 9001 -CMD ["node", "--experimental-worker", "node_modules/ep_etherpad-lite/node/server.js"] +CMD ["node", "--experimental-worker", "src/node/server.js"] diff --git a/README.md b/README.md index 3f1e6fb0..d2dcfbe2 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Update to the latest version with `git pull origin`, then run If cloning to a subdirectory within another project, you may need to do the following: -1. Start the server manually (e.g. `node/node_modules/ep_etherpad-lite/node/server.js`) +1. Start the server manually (e.g. `node src/node/server.js`) 2. Edit the db `filename` in `settings.json` to the relative directory with the file (e.g. `application/lib/etherpad-lite/var/dirty.db`) 3. Add auto-generated files to the main project `.gitignore` diff --git a/src/bin/cleanRun.sh b/src/bin/cleanRun.sh index e8f4bd0d..d8407d92 100755 --- a/src/bin/cleanRun.sh +++ b/src/bin/cleanRun.sh @@ -34,7 +34,6 @@ rm -rf src/node_modules src/bin/installDeps.sh "$@" || exit 1 #Move to the node folder and start -echo "Started Etherpad..." +echo "Starting Etherpad..." -SCRIPTPATH=$(pwd -P) -node $(compute_node_args) "${SCRIPTPATH}/node_modules/ep_etherpad-lite/node/server.js" "$@" +exec node $(compute_node_args) src/node/server.js "$@" diff --git a/src/bin/deb-src/sysroot/etc/init/etherpad.conf b/src/bin/deb-src/sysroot/etc/init/etherpad.conf index aab40bca..82706654 100644 --- a/src/bin/deb-src/sysroot/etc/init/etherpad.conf +++ b/src/bin/deb-src/sysroot/etc/init/etherpad.conf @@ -20,7 +20,7 @@ end script script cd $EPHOME/ - exec su -s /bin/sh -c 'exec "$0" "$@"' $EPUSER -- node node_modules/ep_etherpad-lite/node/server.js \ + exec su -s /bin/sh -c 'exec "$0" "$@"' $EPUSER -- node src/node/server.js \ >> $EPLOGS/access.log \ 2>> $EPLOGS/error.log echo "Etherpad is running on http://localhost:9001 - To change settings edit /opt/etherpad/settings.json" diff --git a/src/bin/debugRun.sh b/src/bin/debugRun.sh index f418f4f6..fd5c34b2 100755 --- a/src/bin/debugRun.sh +++ b/src/bin/debugRun.sh @@ -16,4 +16,4 @@ echo "Open 'chrome://inspect' on Chrome to start debugging." # Use 0.0.0.0 to allow external connections to the debugger # (ex: running Etherpad on a docker container). Use default port # (9229) -node $(compute_node_args) --inspect=0.0.0.0:9229 node_modules/ep_etherpad-lite/node/server.js "$@" +exec node $(compute_node_args) --inspect=0.0.0.0:9229 src/node/server.js "$@" diff --git a/src/bin/fastRun.sh b/src/bin/fastRun.sh index a782cafc..ec53f20f 100755 --- a/src/bin/fastRun.sh +++ b/src/bin/fastRun.sh @@ -19,4 +19,4 @@ cd "${MY_DIR}/../.." || exit 1 echo "Running directly, without checking/installing dependencies" # run Etherpad main class -node $(compute_node_args) "node_modules/ep_etherpad-lite/node/server.js" "$@" +exec node $(compute_node_args) src/node/server.js "$@" diff --git a/src/bin/run.sh b/src/bin/run.sh index 1a2aa36a..4f6993ff 100755 --- a/src/bin/run.sh +++ b/src/bin/run.sh @@ -32,5 +32,4 @@ src/bin/installDeps.sh "$@" || exit 1 # Move to the node folder and start log "Starting Etherpad..." -SCRIPTPATH=$(pwd -P) -exec node $(compute_node_args) "$SCRIPTPATH/node_modules/ep_etherpad-lite/node/server.js" "$@" +exec node $(compute_node_args) src/node/server.js "$@" diff --git a/src/tests/frontend/travis/adminrunner.sh b/src/tests/frontend/travis/adminrunner.sh index da20d280..8f57ac6f 100755 --- a/src/tests/frontend/travis/adminrunner.sh +++ b/src/tests/frontend/travis/adminrunner.sh @@ -14,7 +14,7 @@ MY_DIR=$(try cd "${0%/*}" && try pwd -P) || exit 1 try cd "${MY_DIR}/../../../.." log "Assuming src/bin/installDeps.sh has already been run" -node node_modules/ep_etherpad-lite/node/server.js --experimental-worker "${@}" & +node src/node/server.js --experimental-worker "${@}" & ep_pid=$! log "Waiting for Etherpad to accept connections (http://localhost:9001)..." diff --git a/src/tests/frontend/travis/runner.sh b/src/tests/frontend/travis/runner.sh index b19c2873..5a16ccce 100755 --- a/src/tests/frontend/travis/runner.sh +++ b/src/tests/frontend/travis/runner.sh @@ -14,7 +14,7 @@ MY_DIR=$(try cd "${0%/*}" && try pwd -P) || exit 1 try cd "${MY_DIR}/../../../.." log "Assuming src/bin/installDeps.sh has already been run" -node node_modules/ep_etherpad-lite/node/server.js --experimental-worker "${@}" & +node src/node/server.js --experimental-worker "${@}" & ep_pid=$! log "Waiting for Etherpad to accept connections (http://localhost:9001)..." diff --git a/src/tests/frontend/travis/runnerBackend.sh b/src/tests/frontend/travis/runnerBackend.sh index 8a2e1bab..474cb115 100755 --- a/src/tests/frontend/travis/runnerBackend.sh +++ b/src/tests/frontend/travis/runnerBackend.sh @@ -18,7 +18,7 @@ s!"points":[^,]*!"points": 1000! ' settings.json.template >settings.json log "Assuming src/bin/installDeps.sh has already been run" -node node_modules/ep_etherpad-lite/node/server.js "${@}" & +node src/node/server.js "${@}" & ep_pid=$! log "Waiting for Etherpad to accept connections (http://localhost:9001)..." diff --git a/src/tests/frontend/travis/runnerLoadTest.sh b/src/tests/frontend/travis/runnerLoadTest.sh index 3e9d7d40..3fce737b 100755 --- a/src/tests/frontend/travis/runnerLoadTest.sh +++ b/src/tests/frontend/travis/runnerLoadTest.sh @@ -17,7 +17,7 @@ s!"points":[^,]*!"points": 1000! ' settings.json.template >settings.json log "Assuming src/bin/installDeps.sh has already been run" -node node_modules/ep_etherpad-lite/node/server.js "${@}" >/dev/null & +node src/node/server.js "${@}" >/dev/null & ep_pid=$! log "Waiting for Etherpad to accept connections (http://localhost:9001)..." diff --git a/src/web.config b/src/web.config index e057b919..bd50a60c 100644 --- a/src/web.config +++ b/src/web.config @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@