diff options
author | Peter Martischka <pita@pitapoison.de> | 2010-04-08 14:20:23 +0200 |
---|---|---|
committer | Peter Martischka <pita@pitapoison.de> | 2010-04-08 14:20:23 +0200 |
commit | 5ff65ce80e04028fc9ff299534f92e2836c3636a (patch) | |
tree | bbe0c73d0bffc64adffecb34a9a745819c864539 /infrastructure/net.appjet.oui/config.scala | |
parent | 9c1dfc38451a4ee70c99de16bd5799cbe0c69730 (diff) | |
parent | ef71f285a7263c4df76057baf528e943c8870efb (diff) | |
download | etherpad-5ff65ce80e04028fc9ff299534f92e2836c3636a.tar.gz etherpad-5ff65ce80e04028fc9ff299534f92e2836c3636a.tar.xz etherpad-5ff65ce80e04028fc9ff299534f92e2836c3636a.zip |
Merge branch 'jefferai' of git://github.com/jefferai/pad
Diffstat (limited to '')
-rw-r--r-- | infrastructure/net.appjet.oui/config.scala | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/infrastructure/net.appjet.oui/config.scala b/infrastructure/net.appjet.oui/config.scala index 6201816..2b0e47a 100644 --- a/infrastructure/net.appjet.oui/config.scala +++ b/infrastructure/net.appjet.oui/config.scala @@ -80,6 +80,8 @@ object config { { val argName = "directory" } def appHome = stringOrElse("appHome", ""); + @ConfigParam("Whether to generate https URLs even if running locally behind HTTP (useful for Apache handling HTTPS)") + def useHttpsUrls = boolOrElse("useHttpsUrls", false); @ConfigParam("Search path for modules imported via \"import\". Defaults to current working directory.") { val argName = "dir1:dir2:..." } @@ -114,6 +116,9 @@ object config { else ("", Integer.parseInt(s)) + @ConfigParam("Whether to show the port numbers to the outside world (false: assume ports visible from the outside are the default http/https ports)") + def hidePorts = boolOrElse("hidePorts", false); + @ConfigParam("[host:]port on which to serve the app. Default: 8080.") { val argName = "[host:]port" } def listen = stringOrElse("listen", "8080"); |