Author: yurize
Date: Wed Apr 25 16:27:50 2012
New Revision: 1330397
URL: http://svn.apache.org/viewvc?rev=1330397&view=rev
Log:
Adds missing default values for configuration files + small fixes.
https://reviews.apache.org/r/4741/
Modified:
incubator/wave/trunk/server-config.xml
incubator/wave/trunk/server.config.example
Modified: incubator/wave/trunk/server-config.xml
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/server-config.xml?rev=1330397&r1=1330396&r2=1330397&view=diff
==============================================================================
--- incubator/wave/trunk/server-config.xml (original)
+++ incubator/wave/trunk/server-config.xml Wed Apr 25 16:27:50 2012
@@ -1,6 +1,6 @@
<project name="server config" basedir="." default="server-config">
<description>Creates the server configuration file.</description>
-
+
<!-- Properties for server.config -->
<property name="wave_server_domain" value="local.net" />
<property name="http_frontend_public_address" value="localhost:9898" />
@@ -24,7 +24,9 @@
<property name="delta_persist_executor_thread_count" value="2" />
<property name="disable_registration" value="false" />
<property name="enable_import" value="false" />
-
+ <property name="enable_ssl" value="false" />
+ <property name="ssl_keystore_path" value="wiab.ks" />
+ <property name="ssl_keystore_password" value="changeme" />
<!-- Properties for server.federation.config -->
<property name="xmpp_server_secret" value="opensesame" />
@@ -40,7 +42,7 @@
<property name="xmpp_server_ip" value="${xmpp_server_hostname}" />
<property name="waveserver_disable_verification" value="false" />
<property name="waveserver_disable_signer_verification" value="false" />
-
+
<target name="create-folders">
<mkdir dir="${signer_info_store_directory}" />
<mkdir dir="${attachment_store_directory}" />
@@ -86,6 +88,7 @@
<token key="WAVELET_LOAD_EXECUTOR_THREAD_COUNT"
value="${wavelet_load_executor_thread_count}" />
<token key="DELTA_PERSIST_EXECUTOR_THREAD_COUNT"
value="${delta_persist_executor_thread_count}" />
<token key="DISABLE_REGISTRATION" value="${disable_registration}" />
+ <token key="ENABLE_IMPORT" value="${enable_import}" />
<token key="ENABLE_SSL" value="${enable_ssl}" />
<token key="SSL_KEYSTORE_PATH" value="${ssl_keystore_path}" />
<token key="SSL_KEYSTORE_PASSWORD" value="${ssl_keystore_password}"
/>
Modified: incubator/wave/trunk/server.config.example
URL:
http://svn.apache.org/viewvc/incubator/wave/trunk/server.config.example?rev=1330397&r1=1330396&r2=1330397&view=diff
==============================================================================
--- incubator/wave/trunk/server.config.example (original)
+++ incubator/wave/trunk/server.config.example Wed Apr 25 16:27:50 2012
@@ -115,14 +115,18 @@ waveserver_disable_signer_verification =
# Default value: false
disable_registration = @DISABLE_REGISTRATION@
-# Enable SSL for all address/port combinations listed (makes the next 2
settings non-optional)
+# Enable SSL for all address/port combinations listed (makes the next 2
settings non-optional).
+# Default value: false
enable_ssl = @ENABLE_SSL@
# Path to keystore containg the ssl certificates to server
+# Note: this is only used when enable_ssl set to true.
ssl_keystore_path = @SSL_KEYSTORE_PATH@
-#Password to the keystore
+#Password to the keystore.
+# Note: this is only used when enable_ssl set to true.
ssl_keystore_password = @SSL_KEYSTORE_PASSWORD@
-# Enable import of waves via /import URL. Default value: false
+# Enable import of waves via /import URL.
+# Default value: false
enable_import = @ENABLE_IMPORT@
