Author: solomax
Date: Thu Mar 31 10:56:30 2016
New Revision: 1737219
URL: http://svn.apache.org/viewvc?rev=1737219&view=rev
Log:
No jira: RTMPS related documentation update; code clean-up
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml?rev=1737219&r1=1737218&r2=1737219&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
Thu Mar 31 10:56:30 2016
@@ -108,27 +108,21 @@ Enter key password for <red5>
<li>Please NOTE according to this <a
href="http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html";>http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html</a>
guide you can split keystore and
truststore (OPTIONAL you might just copy keystore to truststore)
</li>
- <li>Create additional certificate as described above.
- Add this certificate to the following keystores:
<tt>red5/conf/keystore.screen</tt> and <tt>red5/conf/keystore</tt>. (This step
is required to be able to use
- screen-sharing web application, you can copy "main"
keystore while testing)
- </li>
+ <li>Create additional certificate as described
above.
+ Add this certificate to the following
keystores: <tt>red5/conf/keystore.screen</tt> and <tt>red5/conf/keystore</tt>.
(This step is required to be able to use
+ screen-sharing web application, you can
copy "main" keystore while testing)
+ </li>
</ol>
</section>
<section name="Set up RTMPS">
-
- <ol>
- <li>
- Uncomment <tt><!-- RTMPS --></tt> section in
<tt>red5/conf/red5-core.xml</tt>
- </li>
-
+ <ol>
<li> Default RTMPS port is 8443, you can change
it by editing <tt>red5/conf/red5.properties</tt> and change the port here:
<tt>rtmps.port=8443</tt><br/>
Please set
<tt>rtmps.keystorepass=password</tt> and <tt>rtmps.truststorepass=password</tt>
(password = password you set on your
new keystore(s))<br/>
Additionally you need to set
<tt>rtmps.screen.keystorepass=screenpassword</tt> (screenpassword = password
you set on your keystore for screen-sharing application)
</li>
-
<li>
Edit
<tt>red5/webapps/openmeetings/public/config.xml</tt> and set<br/>
<tt><rtmpsslport>8443</rtmpsslport></tt>,<br/>
@@ -141,13 +135,9 @@ Enter key password for <red5>
<li>Restart red5 and try to connect - your
connection should now be
made via RTMPS (close port 1935 to be
sure)
</li>
-
</ol>
-
</section>
-
<section name="SSL for the web interface">
-
<p>If you want to use SSL for the web interface in
addition to RTMPS,
you need to make some further modifications.
This is mainly to secure
the server against MITM attacks, additionally
some other features
@@ -168,26 +158,13 @@ Enter key password for <red5>
Edit
<tt>red5/webapps/openmeetings/public/config.xml</tt> and set
<tt><red5httpport>5443</red5httpport></tt> port
</li>
- <li>In
<tt>webapps/openmeetings/WEB-INF/conf/axis2.xml</tt> add (below the existing
http transportReceiver (around line 225))
- <source>
-<![CDATA[
-<transportReceiver name="https"
class="org.apache.axis2.transport.http.AxisServletListener">
- <parameter name="port">5443</parameter>
-</transportReceiver>
-]]>
- </source>
- </li>
- <li>Please NOTE https port set in
<tt>red5/conf/red5.properties</tt> should be in sync with the one set
- in
<tt>red5/webapps/openmeetings/public/config.xml</tt> and
<tt>webapps/openmeetings/WEB-INF/conf/axis2.xml</tt>
- </li>
<li>
Restart red5 and try to connect to
<u>https://your.server:5443</u> - you
should be redirected to the OpenMeetings
app and all access should be via HTTPS
or RTMPS (close port 5080 to be sure).
</li>
- </ol>
-
- </section>
+ </ol>
+ </section>
<section name="Credits">
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml?rev=1737219&r1=1737218&r2=1737219&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
Thu Mar 31 10:56:30 2016
@@ -51,17 +51,14 @@
<pattern>%5p %d{MM-dd HH:mm:ss.SSS } %F %r %L %c [%t] -
%m%n</pattern>
</layout>
</appender>
- <logger name="org.apache.axis2" level="ERROR" />
<logger name="com.mchange.v2" level="ERROR" />
<logger name="org.apache.axiom" level="ERROR" />
<logger name="org.apache.commons.httpclient" level="ERROR" />
<logger name="de.hunsicker.jalopy.io" level="ERROR" />
- <logger name="org.apache.axis2.enterprise" level="ERROR" />
<logger name="httpclient.wire.header" level="ERROR" />
<logger name="org.apache.directory" level="INFO" />
<logger name="org.apache.mina.filter.ssl.SslFilter" level="ERROR" />
<logger name="org.apache.wicket" level="WARN" />
- <logger
name="org.apache.openmeetings.core.remote.red5.ScopeApplicationAdapter"
level="TRACE" />
<root level="DEBUG">
<appender-ref ref="FLOG2" />
<appender-ref ref="CONSOLE2" />
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml?rev=1737219&r1=1737218&r2=1737219&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
Thu Mar 31 10:56:30 2016
@@ -108,27 +108,21 @@ Enter key password for <red5>
<li>Please NOTE according to this <a
href="http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html";>http://javarevisited.blogspot.com/2012/09/difference-between-truststore-vs-keyStore-Java-SSL.html</a>
guide you can split keystore and
truststore (OPTIONAL you might just copy keystore to truststore)
</li>
- <li>Create additional certificate as described above.
- Add this certificate to the following keystores:
<tt>red5/conf/keystore.screen</tt> and <tt>red5/conf/keystore</tt>. (This step
is required to be able to use
- screen-sharing web application, you can copy "main"
keystore while testing)
- </li>
+ <li>Create additional certificate as described
above.
+ Add this certificate to the following
keystores: <tt>red5/conf/keystore.screen</tt> and <tt>red5/conf/keystore</tt>.
(This step is required to be able to use
+ screen-sharing web application, you can
copy "main" keystore while testing)
+ </li>
</ol>
</section>
<section name="Set up RTMPS">
-
<ol>
- <li>
- Uncomment <tt><!-- RTMPS --></tt> section in
<tt>red5/conf/red5-core.xml</tt>
- </li>
-
<li> Default RTMPS port is 8443, you can change
it by editing <tt>red5/conf/red5.properties</tt> and change the port here:
<tt>rtmps.port=8443</tt><br/>
Please set
<tt>rtmps.keystorepass=password</tt> and <tt>rtmps.truststorepass=password</tt>
(password = password you set on your
new keystore(s))<br/>
Additionally you need to set
<tt>rtmps.screen.keystorepass=screenpassword</tt> (screenpassword = password
you set on your keystore for screen-sharing application)
</li>
-
<li>
Edit
<tt>red5/webapps/openmeetings/public/config.xml</tt> and set<br/>
<tt><rtmpsslport>8443</rtmpsslport></tt>,<br/>
@@ -141,13 +135,9 @@ Enter key password for <red5>
<li>Restart red5 and try to connect - your
connection should now be
made via RTMPS (close port 1935 to be
sure)
</li>
-
</ol>
-
</section>
-
<section name="SSL for the web interface">
-
<p>If you want to use SSL for the web interface in
addition to RTMPS,
you need to make some further modifications.
This is mainly to secure
the server against MITM attacks, additionally
some other features
@@ -168,26 +158,13 @@ Enter key password for <red5>
Edit
<tt>red5/webapps/openmeetings/public/config.xml</tt> and set
<tt><red5httpport>5443</red5httpport></tt> port
</li>
- <li>In
<tt>webapps/openmeetings/WEB-INF/conf/axis2.xml</tt> add (below the existing
http transportReceiver (around line 225))
- <source>
-<![CDATA[
-<transportReceiver name="https"
class="org.apache.axis2.transport.http.AxisServletListener">
- <parameter name="port">5443</parameter>
-</transportReceiver>
-]]>
- </source>
- </li>
- <li>Please NOTE https port set in
<tt>red5/conf/red5.properties</tt> should be in sync with the one set
- in
<tt>red5/webapps/openmeetings/public/config.xml</tt> and
<tt>webapps/openmeetings/WEB-INF/conf/axis2.xml</tt>
- </li>
<li>
Restart red5 and try to connect to
<u>https://your.server:5443</u> - you
should be redirected to the OpenMeetings
app and all access should be via HTTPS
or RTMPS (close port 5080 to be sure).
</li>
- </ol>
-
- </section>
+ </ol>
+ </section>
<section name="Credits">
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml?rev=1737219&r1=1737218&r2=1737219&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
Thu Mar 31 10:56:30 2016
@@ -51,12 +51,10 @@
<pattern>%5p %d{MM-dd HH:mm:ss.SSS } %F %r %L %c [%t] -
%m%n</pattern>
</layout>
</appender>
- <logger name="org.apache.axis2" level="ERROR" />
<logger name="com.mchange.v2" level="ERROR" />
<logger name="org.apache.axiom" level="ERROR" />
<logger name="org.apache.commons.httpclient" level="ERROR" />
<logger name="de.hunsicker.jalopy.io" level="ERROR" />
- <logger name="org.apache.axis2.enterprise" level="ERROR" />
<logger name="httpclient.wire.header" level="ERROR" />
<logger name="org.apache.directory" level="INFO" />
<logger name="org.apache.mina.filter.ssl.SslFilter" level="ERROR" />
