Merge branch 'master' into councilbox

pull/88/head
miguelrcDEV 2018-05-03 10:27:39 +02:00
commit 94f3b506a0
3 changed files with 3 additions and 2 deletions

View File

@ -32,7 +32,7 @@ COPY kms.sh /kms.sh
EXPOSE 8888
EXPOSE 9091
EXPOSE 4443
EXPOSE 8443
# Exec supervisord
CMD ["/usr/bin/supervisord"]

View File

@ -12,9 +12,9 @@ RUN mkdir -p /var/log/supervisor
COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
# Copy OpenVidu Server
COPY openvidu-server.jar /
COPY openvidu-server-cbx.jar /
EXPOSE 8443
EXPOSE 8888
# Exec supervisord

View File

@ -4,6 +4,7 @@ openvidu.recording.version: 2.0.0
server.port: 8443
server.ssl.key-store: /home/openvidu_certs/councilbox.jks
server.ssl.key-store-password: C0uncilbox@2016
#server.ssl.key-store: classpath:cbx_cert.jks
server.ssl.key-store-type: JKS
server.ssl.key-alias: councilbox