Author: solomax
Date: Thu Apr 9 08:12:00 2015
New Revision: 1672257
URL: http://svn.apache.org/r1672257
Log:
[OPENMEETINGS-1190] screen-sharing keystore using it's own password
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
openmeetings/trunk/site/RTMPSAndHTTPS.html
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1672257&r1=1672256&r2=1672257&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
Thu Apr 9 08:12:00 2015
@@ -217,7 +217,7 @@ public class ScreenController {
fis.read(keyBytes);
keystore = Hex.encodeHexString(keyBytes);
- password =
red5Props.getProperty("rtmps.keystorepass");
+ password =
red5Props.getProperty("rtmps.screen.keystorepass");
/*
KeyStore ksIn =
KeyStore.getInstance(KeyStore.getDefaultType());
Modified:
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml?rev=1672257&r1=1672256&r2=1672257&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-server/src/site/xdoc/RTMPSAndHTTPS.xml
Thu Apr 9 08:12:00 2015
@@ -127,7 +127,8 @@ Enter key password for <red5>
<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))
+ (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>
Modified: openmeetings/trunk/site/RTMPSAndHTTPS.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/site/RTMPSAndHTTPS.html?rev=1672257&r1=1672256&r2=1672257&view=diff
==============================================================================
--- openmeetings/trunk/site/RTMPSAndHTTPS.html (original)
+++ openmeetings/trunk/site/RTMPSAndHTTPS.html Thu Apr 9 08:12:00 2015
@@ -1,6 +1,6 @@
<!DOCTYPE html>
<!--
- | Generated by Apache Maven Doxia at 2015-02-15
+ | Generated by Apache Maven Doxia at 2015-04-09
| Rendered using Apache Maven Fluido Skin 1.3.1
-->
<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
@@ -8,7 +8,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="OpenMeetings Team" />
- <meta name="Date-Revision-yyyymmdd" content="20150215" />
+ <meta name="Date-Revision-yyyymmdd" content="20150409" />
<meta http-equiv="Content-Language" content="en" />
<title>Apache OpenMeetings Project – Using OpenMeetings with RTMPS
and HTTPS</title>
<link rel="stylesheet" href="./css/apache-maven-fluido-1.3.1.min.css" />
@@ -43,7 +43,7 @@
<ul class="breadcrumb">
- <li id="publishDate">Last Published: 2015-02-15
+ <li id="publishDate">Last Published: 2015-04-09
</li>
@@ -902,7 +902,8 @@ Enter key password for <red5>
<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))
+ (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>
