Replace `node_modules/ep_etherpad-lite` with `src`

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"]

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`
 

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 "$@"

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"

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 "$@"

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 "$@"

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 "$@"

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)..."

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)..."

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)..."

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)..."

src/web.config

@@ -2,7 +2,7 @@
   <system.webServer>
 
     <handlers>
-      <add name="iisnode" path="node_modules/ep_etherpad-lite/node/server.js" verb="*" modules="iisnode" />
+      <add name="iisnode" path="src/node/server.js" verb="*" modules="iisnode" />
     </handlers>
 
     <rewrite>
@@ -10,7 +10,7 @@
             <!-- uncomment this section to enable debugging
             <rule name="LogFile" patternSyntax="ECMAScript" stopProcessing="true">
                 <match url="iisnode"/>
-                <action type="Rewrite" url="node_modules/ep_etherpad-lite/node/iisnode" />
+                <action type="Rewrite" url="src/node/iisnode" />
             </rule>
             <rule name="NodeInspector" patternSyntax="ECMAScript" stopProcessing="true">                    
                 <match url="^server.js\/debug[\/]?" />
@@ -23,7 +23,7 @@
                  <conditions>
                       <add input="{{REQUEST_FILENAME}}" matchType="IsFile" negate="True"/>
                  </conditions>
-                <action type="Rewrite" url="node_modules/ep_etherpad-lite/node/server.js" />
+                <action type="Rewrite" url="src/node/server.js" />
             </rule>
         </rules>
     </rewrite>

start.bat

@@ -1 +1 @@
-node node_modules\ep_etherpad-lite\node\server.js
+node src\node\server.js