From 6ae298615471ae1aad1ac56f06d095f5a3912b8a Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 21 Aug 2014 21:34:07 +0100 Subject: [PATCH 1/6] Update for web and media --- manual/source/configure.rst | 81 +++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/manual/source/configure.rst b/manual/source/configure.rst index a41f7ef..27bf352 100644 --- a/manual/source/configure.rst +++ b/manual/source/configure.rst @@ -264,6 +264,37 @@ X11 appears to affect different versions and distributions differently, this setting has been added, rather than try and work it out programmatically. +Players +======= + +.. image:: pics/configuremedia.png + +Available Media Players +^^^^^^^^^^^^^^^^^^^^^^^ + +Select the media players you want to be available for use. As a general rule the +players control the following: + +**Phonon:** + Phonon is an internal media player which uses your operating system's + built-in media player capabilities. + +**Webkit:** + WebKit is another internal media player, which adds text-over-video to OpenLP. + +**VLC:** + This uses the well-known VLC media player to show videos. VLC has a + reputation of being able to handle almost any video or audio format. + +**Note:** You must have `VLC `_ installed for the +VLC option to be available. + +Player Order +^^^^^^^^^^^^ + +Determines the preference order of the selected media players. The order is +changed by selecting one of the available players and using the +:guilabel:`Down` or :guilabel:`Up` button to change the position of the player. .. _config_songs: @@ -378,38 +409,10 @@ it is resized. .. _media_configure: + Media ===== -.. image:: pics/configuremedia.png - -Available Media Players -^^^^^^^^^^^^^^^^^^^^^^^ - -Select the media players you want to be available for use. As a general rule the -players control the following: - -**Phonon:** - Phonon is an internal media player which uses your operating system's - built-in media player capabilities. - -**Webkit:** - WebKit is another internal media player, which adds text-over-video to OpenLP. - -**VLC:** - This uses the well-known VLC media player to show videos. VLC has a - reputation of being able to handle almost any video or audio format. - -**Note:** You must have `VLC `_ installed for the -VLC option to be available. - -Player Order -^^^^^^^^^^^^ - -Determines the preference order of the selected media players. The order is -changed by selecting one of the available players and using the -:guilabel:`Down` or :guilabel:`Up` button to change the position of the player. - Advanced ^^^^^^^^ @@ -490,8 +493,10 @@ about this feature here: :ref:`web_remote`. **Note:** To use either of these features, your computers will need to be on the same network, wired or wireless. -Server Settings -^^^^^^^^^^^^^^^ +.. _non_secure: + +Server Settings- Non Secure +^^^^^^^^^^^^^^^^^^^^^^^^^^^ .. image:: pics/configureremotes.png @@ -518,6 +523,20 @@ Android app. smartphone, to view the live service display in a basic black and white format. This URL shows the address you will use in the remote browser for stage view. + +Server Settings- Secure +^^^^^^^^^^^^^^^^^^^^^^^ +These options are identical in meaning to the ones documented in non_secure_. +The only difference is these require an SSL cetificate to provide the security. +Instructions for creating and installing a certificate are documented at +`Generate SSL certificate _. +*Changing from a Secure to Non Secure setup requires a restart of OpenLP.* + +User Authentication +^^^^^^^^^^^^^^^^^^^ +This option allows the additional security for update functions via the web or +android interfaces. Once the userid and password have been accepted then updates +will be possible for duration of the web session. Android App ^^^^^^^^^^^ From d0926a847960505dcb7ded285a57cbb9d12ad31f Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 31 Aug 2015 07:56:15 +0100 Subject: [PATCH 2/6] Fix error and migrate to python 3 --- manual/Makefile | 2 +- manual/make.bat | 2 +- manual/source/configure.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manual/Makefile b/manual/Makefile index aa8e5f4..7584f3c 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -3,7 +3,7 @@ # You can set these variables from the command line. SPHINXOPTS = -SPHINXBUILD = sphinx-build +SPHINXBUILD = sphinx-build-3 PAPER = # Internal variables. diff --git a/manual/make.bat b/manual/make.bat index 20bff1e..79da54c 100644 --- a/manual/make.bat +++ b/manual/make.bat @@ -2,7 +2,7 @@ REM Command file for Sphinx documentation -set SPHINXBUILD=sphinx-build +set SPHINXBUILD=sphinx-build-3 set ALLSPHINXOPTS=-d build/doctrees %SPHINXOPTS% source if NOT "%PAPER%" == "" ( set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% diff --git a/manual/source/configure.rst b/manual/source/configure.rst index 27bf352..4f033dc 100644 --- a/manual/source/configure.rst +++ b/manual/source/configure.rst @@ -529,7 +529,7 @@ Server Settings- Secure These options are identical in meaning to the ones documented in non_secure_. The only difference is these require an SSL cetificate to provide the security. Instructions for creating and installing a certificate are documented at -`Generate SSL certificate _. +`Generate SSL certificate `_. *Changing from a Secure to Non Secure setup requires a restart of OpenLP.* User Authentication From fa4d6817c7af8cdf47ddf400ab26b1fd06a15206 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Mon, 31 Aug 2015 08:33:43 +0100 Subject: [PATCH 3/6] fix style and add certificate gen --- manual/source/configure.rst | 65 ++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 5 deletions(-) diff --git a/manual/source/configure.rst b/manual/source/configure.rst index 4f033dc..5fe04a9 100644 --- a/manual/source/configure.rst +++ b/manual/source/configure.rst @@ -526,17 +526,72 @@ Android app. Server Settings- Secure ^^^^^^^^^^^^^^^^^^^^^^^ -These options are identical in meaning to the ones documented in non_secure_. +These options are identical in meaning to the ones documented in :ref:`non_secure`. The only difference is these require an SSL cetificate to provide the security. -Instructions for creating and installing a certificate are documented at -`Generate SSL certificate `_. +Instructions for creating and installing a certificate are documented in +Generate SSL certificate :ref:`ssl_config`. + *Changing from a Secure to Non Secure setup requires a restart of OpenLP.* User Authentication ^^^^^^^^^^^^^^^^^^^ This option allows the additional security for update functions via the web or -android interfaces. Once the userid and password have been accepted then updates -will be possible for duration of the web session. +android interfaces. Once the userid and password have been accepted then +updates will be possible for duration of the web session. This option can be +changed without the need to restart OpenLP. + +.. _ssl_config: + +Generating and Installing a Certificate +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +To make the Remote access run in a secure manner ssl certificates need to be +provided to OpenLP. This is completely optional. On Linux you will need the +"openssl" package installed. On Mac OS X openssl should be installed by default. +On Windows you will need to download OpenSSL for Windows. + +First create a configuration file for OpenSSL named openlp.cnf:: + + #-------------openssl.cnf---------------- + [ req ] + default_bits = 1024 # Size of keys + default_keyfile = key.pem # name of generated keys + default_md = des3 # message digest algorithm + string_mask = nombstr # permitted characters + distinguished_name = req_distinguished_name + + [ req_distinguished_name ] + # Variable name Prompt string + 0.organizationName = Organization Name (company) + organizationalUnitName = Organizational Unit Name (department, division) + emailAddress = Email Address + emailAddress_max = 40 + localityName = Locality Name (city, district) + stateOrProvinceName = State or Province Name (full name) + countryName = Country Name (2 letter code) + countryName_min = 2 + countryName_max = 2 + commonName = Common Name (hostname, IP, or your name) + commonName_max = 64 + + #-------------------Edit this section------------------------------ + countryName_default = -- + stateOrProvinceName_default = None + localityName_default = Everywhere + 0.organizationName_default = OpenLP + organizationalUnitName_default = Remote + commonName_default = 0.0.0.0 + emailAddress_default = openlp@localhost + +Then generate your keys and certificate:: + + echo openlp | openssl genrsa -passout stdin -des3 -out openlp.key 1024 + cp openlp.key openlp.key.bak + echo openlp | openssl rsa -passin stdin -in openlp.key.bak -out openlp.key + + openssl req -new -key openlp.key -out openlp.csr -config openlp.cnf -batch + openssl x509 -req -days 365 -in openlp.csr -signkey openlp.key -out openlp.crt + +The crt and key files need to then be placed in {data}/remotes directory. Android App ^^^^^^^^^^^ From 83f064a1f0804121a8fb1a5446336f10ced0b6b0 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Wed, 2 Sep 2015 21:17:15 +0100 Subject: [PATCH 4/6] fix build script --- manual/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual/Makefile b/manual/Makefile index 7584f3c..b516693 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -3,7 +3,7 @@ # You can set these variables from the command line. SPHINXOPTS = -SPHINXBUILD = sphinx-build-3 +SPHINXBUILD = `which sphinx-build-3 || which sphinx-build` PAPER = # Internal variables. From 1f1db94023055205d0cce87f83cefa603ffc9870 Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Thu, 3 Sep 2015 05:40:12 +0100 Subject: [PATCH 5/6] Better fix --- manual/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual/Makefile b/manual/Makefile index b516693..9f5ded6 100644 --- a/manual/Makefile +++ b/manual/Makefile @@ -3,7 +3,7 @@ # You can set these variables from the command line. SPHINXOPTS = -SPHINXBUILD = `which sphinx-build-3 || which sphinx-build` +SPHINXBUILD = $(shell which sphinx-build-3 || which sphinx-build) PAPER = # Internal variables. From 5e396c7a9ba88cbb2930cb60b02abdac65dbd57e Mon Sep 17 00:00:00 2001 From: Tim Bentley Date: Fri, 4 Sep 2015 21:05:26 +0100 Subject: [PATCH 6/6] revert bat change --- manual/make.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manual/make.bat b/manual/make.bat index 79da54c..20bff1e 100644 --- a/manual/make.bat +++ b/manual/make.bat @@ -2,7 +2,7 @@ REM Command file for Sphinx documentation -set SPHINXBUILD=sphinx-build-3 +set SPHINXBUILD=sphinx-build set ALLSPHINXOPTS=-d build/doctrees %SPHINXOPTS% source if NOT "%PAPER%" == "" ( set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%