Author: al Date: Sat Jun 8 11:06:30 2013 New Revision: 1490955 URL: http://svn.apache.org/r1490955 Log: Add prosody configuration generator.
Can be found at 'ant prosody-config' By Bruno Gonzalez. https://reviews.apache.org/r/11669/ Added: incubator/wave/trunk/prosody.cfg.lua.example Modified: incubator/wave/trunk/server-config.xml incubator/wave/trunk/server.federation.config.example incubator/wave/trunk/src/org/waveprotocol/wave/federation/FederationSettings.java incubator/wave/trunk/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java Added: incubator/wave/trunk/prosody.cfg.lua.example URL: http://svn.apache.org/viewvc/incubator/wave/trunk/prosody.cfg.lua.example?rev=1490955&view=auto ============================================================================== --- incubator/wave/trunk/prosody.cfg.lua.example (added) +++ incubator/wave/trunk/prosody.cfg.lua.example Sat Jun 8 11:06:30 2013 @@ -0,0 +1,12 @@ +component_ports = { @XMPP_SERVER_COMPONENT_PORT@ } +s2s_ports = { @XMPP_SERVER_TO_SERVER_PORT@ } + +VirtualHost "@CERTIFICATE_DOMAIN@" + enabled = true + ssl = { + key = "@BASEDIR@/@CERTIFICATE_PRIVATE_KEY@"; + certificate = "@BASEDIR@/@[email protected]"; + } + +Component "@XMPP_JID@" + component_secret = "@XMPP_SERVER_SECRET@" Modified: incubator/wave/trunk/server-config.xml URL: http://svn.apache.org/viewvc/incubator/wave/trunk/server-config.xml?rev=1490955&r1=1490954&r2=1490955&view=diff ============================================================================== --- incubator/wave/trunk/server-config.xml (original) +++ incubator/wave/trunk/server-config.xml Sat Jun 8 11:06:30 2013 @@ -60,7 +60,8 @@ <property name="xmpp_jid" value="${xmpp_component_name}.${wave_server_domain}" /> <property name="xmpp_server_description" value=""Wave in a Box"" /> <property name="xmpp_server_hostname" value="${wave_server_domain}" /> - <property name="xmpp_server_port" value="5275" /> + <property name="xmpp_server_component_port" value="5275" /> + <property name="xmpp_server_to_server_port" value="5269" /> <property name="xmpp_server_ping" value="wavesandbox.com" /> <property name="xmpp_server_ip" value="${xmpp_server_hostname}" /> <property name="waveserver_disable_verification" value="false" /> @@ -152,7 +153,7 @@ <token key="XMPP_JID" value="${xmpp_jid}" /> <token key="XMPP_SERVER_DESCRIPTION" value="${xmpp_server_description}" /> <token key="XMPP_SERVER_HOSTNAME" value="${xmpp_server_hostname}" /> - <token key="XMPP_SERVER_PORT" value="${xmpp_server_port}" /> + <token key="XMPP_SERVER_COMPONENT_PORT" value="${xmpp_server_component_port}" /> <token key="XMPP_SERVER_PING" value="${xmpp_server_ping}" /> <token key="XMPP_SERVER_IP" value="${xmpp_server_ip}" /> <token key="WAVESERVER_DISABLE_VERIFICATION" value="${waveserver_disable_verification}" /> @@ -162,4 +163,31 @@ </filterchain> </copy> </target> + + <target name="prosody-config" depends="server-federation-config" + description="Run to create the server, federation and prosody configuration files. + ant -f server-config.xml server-federation-config prosody-config -Dserver_federation_config=server.federation.config"> + <echo>Generating ${certificate_domain}.cfg.lua</echo> + <copy file="${certificate_domain}.cfg.lua" + tofile="${certificate_domain}.cfg.lua.old" + overwrite="true" + failonerror="false" /> + <copy file="prosody.cfg.lua.example" tofile="${certificate_domain}.cfg.lua" overwrite="true"> + <filterchain> + <replacetokens> + <token key="BASEDIR" value="${basedir}" /> + <token key="XMPP_SERVER_SECRET" value="${xmpp_server_secret}" /> + <token key="CERTIFICATE_PRIVATE_KEY" value="${certificate_private_key}" /> + <token key="CERTIFICATE_DOMAIN" value="${certificate_domain}" /> + <token key="XMPP_JID" value="${xmpp_jid}" /> + <token key="XMPP_SERVER_DESCRIPTION" value="${xmpp_server_description}" /> + <token key="XMPP_SERVER_COMPONENT_PORT" value="${xmpp_server_component_port}" /> + <token key="XMPP_SERVER_TO_SERVER_PORT" value="${xmpp_server_to_server_port}" /> + </replacetokens> + </filterchain> + </copy> + <echo>Please, manually copy ${certificate_domain}.cfg.lua to your prosody configuration directory.</echo> + <echo>E.g. sudo cp ${certificate_domain}.cfg.lua /etc/prosody/conf.d/${certificate_domain}.cfg.lua</echo> + <echo>Additionally, ensure your ${certificate_domain} SRV record points to port ${xmpp_server_to_server_port}</echo> + </target> </project> Modified: incubator/wave/trunk/server.federation.config.example URL: http://svn.apache.org/viewvc/incubator/wave/trunk/server.federation.config.example?rev=1490955&r1=1490954&r2=1490955&view=diff ============================================================================== --- incubator/wave/trunk/server.federation.config.example (original) +++ incubator/wave/trunk/server.federation.config.example Sat Jun 8 11:06:30 2013 @@ -48,7 +48,7 @@ xmpp_server_description = @XMPP_SERVER_D xmpp_server_hostname = @XMPP_SERVER_HOSTNAME@ # Default value: 5275 -xmpp_server_port = @XMPP_SERVER_PORT@ +xmpp_server_component_port = @XMPP_SERVER_COMPONENT_PORT@ # Default value: wavesandbox.com xmpp_server_ping = @XMPP_SERVER_PING@ Modified: incubator/wave/trunk/src/org/waveprotocol/wave/federation/FederationSettings.java URL: http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/federation/FederationSettings.java?rev=1490955&r1=1490954&r2=1490955&view=diff ============================================================================== --- incubator/wave/trunk/src/org/waveprotocol/wave/federation/FederationSettings.java (original) +++ incubator/wave/trunk/src/org/waveprotocol/wave/federation/FederationSettings.java Sat Jun 8 11:06:30 2013 @@ -31,7 +31,7 @@ public class FederationSettings { public static final String XMPP_SERVER_HOSTNAME = "xmpp_server_hostname"; public static final String XMPP_SERVER_SECRET = "xmpp_server_secret"; public static final String XMPP_COMPONENT_NAME = "xmpp_component_name"; - public static final String XMPP_SERVER_PORT = "xmpp_server_port"; + public static final String XMPP_SERVER_COMPONENT_PORT = "xmpp_server_component_port"; public static final String XMPP_SERVER_IP = "xmpp_server_ip"; public static final String XMPP_SERVER_DESCRIPTION = "xmpp_server_description"; public static final String XMPP_DISCO_FAILED_EXPIRY_SECS = "xmpp_disco_failed_expiry_secs"; @@ -51,7 +51,7 @@ public class FederationSettings { @Setting(name = XMPP_COMPONENT_NAME) private static String xmppComponentName; - @Setting(name = XMPP_SERVER_PORT) + @Setting(name = XMPP_SERVER_COMPONENT_PORT) private static int xmppServerPort; @Setting(name = XMPP_SERVER_IP) Modified: incubator/wave/trunk/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java URL: http://svn.apache.org/viewvc/incubator/wave/trunk/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java?rev=1490955&r1=1490954&r2=1490955&view=diff ============================================================================== --- incubator/wave/trunk/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java (original) +++ incubator/wave/trunk/src/org/waveprotocol/wave/federation/xmpp/ComponentPacketTransport.java Sat Jun 8 11:06:30 2013 @@ -69,7 +69,7 @@ public class ComponentPacketTransport im @Named(FederationSettings.XMPP_SERVER_HOSTNAME) String serverDomain, @Named(FederationSettings.XMPP_SERVER_SECRET) String serverSecret, @Named(FederationSettings.XMPP_SERVER_IP) String serverAddress, - @Named(FederationSettings.XMPP_SERVER_PORT) int serverPort) { + @Named(FederationSettings.XMPP_SERVER_COMPONENT_PORT) int serverPort) { this.handler = handler; this.componentName = componentName; this.serverDomain = serverDomain;
