aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rwxr-xr-xetherpad/bin/run-local.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d0995e3..850962b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*~
+etherpad/etc/etherpad.local.properties
etherpad/src/etherpad/collab/ace/contentcollector.js
etherpad/src/etherpad/collab/ace/domline.js
etherpad/src/etherpad/collab/ace/easysync1.js
diff --git a/etherpad/bin/run-local.sh b/etherpad/bin/run-local.sh
index 72b0cc1..67a6d57 100755
--- a/etherpad/bin/run-local.sh
+++ b/etherpad/bin/run-local.sh
@@ -34,7 +34,7 @@ if [ -z "$JAVA" ]; then
fi
# etherpad properties file
-cfg_file=./data/etherpad.local.properties
+cfg_file=./etc/etherpad.local.properties
if [ ! -f $cfg_file ]; then
cfg_file=./etc/etherpad.localdev-default.properties
fi