aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Mitchell <etherpad@jefferai.org>2010-04-07 19:46:29 -0400
committerJeff Mitchell <etherpad@jefferai.org>2010-04-07 19:47:24 -0400
commit487168379a5a16598286997f1e1110eeb0c0a197 (patch)
treeb197312c4be922040cd8a7c838ab34a6b18eb82d
parent674d560a2fdbedbda0a3fc3328be102e884b345b (diff)
downloadetherpad-487168379a5a16598286997f1e1110eeb0c0a197.tar.gz
etherpad-487168379a5a16598286997f1e1110eeb0c0a197.tar.xz
etherpad-487168379a5a16598286997f1e1110eeb0c0a197.zip
Modify to add some templates for the added parameters, plus rearrange into alphabetical order
-rw-r--r--etherpad/etc/etherpad.localdev-default.properties9
1 files changed, 6 insertions, 3 deletions
diff --git a/etherpad/etc/etherpad.localdev-default.properties b/etherpad/etc/etherpad.localdev-default.properties
index 1143178..07dce96 100644
--- a/etherpad/etc/etherpad.localdev-default.properties
+++ b/etherpad/etc/etherpad.localdev-default.properties
@@ -1,19 +1,22 @@
+alwaysHttps = false
ajstdlibHome = ../infrastructure/framework-src/modules
appjetHome = ./data/appjet
devMode = true
etherpad.adminPass = password
etherpad.fakeProduction = false
etherpad.isProduction = false
+etherpad.proAccounts = true
etherpad.SQL_JDBC_DRIVER = com.mysql.jdbc.Driver
etherpad.SQL_JDBC_URL = jdbc:mysql://localhost:3306/etherpad
etherpad.SQL_PASSWORD = password
etherpad.SQL_USERNAME = etherpad
-etherpad.proAccounts = true
+hidePorts = false
listen = 9000
logDir = ./data/logs
modulePath = ./src
+motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0
+topdomains = localhost
transportPrefix = /comet
transportUseWildcardSubdomains = true
+useHttpsUrls = false
useVirtualFileRoot = ./src
-motdPage = /ep/pad/view/ro.3PfHCD0ApLc/latest?fullScreen=1&slider=0&sidebar=0
-topdomains = localhost