diff options
| author | Jeff Mitchell <etherpad@jefferai.org> | 2010-04-07 18:09:43 -0400 |
|---|---|---|
| committer | Jeff Mitchell <etherpad@jefferai.org> | 2010-04-07 18:09:43 -0400 |
| commit | 2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7 (patch) | |
| tree | 0084c984ae001b93758d5bdcc4feddad9565a6d7 /etherpad/bin | |
| parent | d84d8b6bd3e6443c5d78b761d1585eaec24f77e7 (diff) | |
| download | etherpad-2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7.tar.gz etherpad-2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7.tar.bz2 etherpad-2cbc8b55729ccf17fc7b733f36547f1a6ccf71b7.zip | |
Look for the etherpad.local.properties file in the logical location (same directory as the default file) instead of the nonexistent data directory. Also update the .gitignore to ignore this file.
Diffstat (limited to 'etherpad/bin')
| -rwxr-xr-x | etherpad/bin/run-local.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |