rpm packaging changes and documentation

distros/redhat/CMakeLists.txt

@@ -62,17 +62,16 @@ install(CODE "execute_process(COMMAND ln -sf ../../../../../../var/lib/zoneminde
 # Link to Cambozola
 install(CODE "execute_process(COMMAND ln -sf ../../java/cambozola.jar \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/cambozola.jar\")")
 
-# Install auxiliary files required to run zoneminder on CentOS
+# Install auxiliary files
 install(FILES misc/redalert.wav DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/sounds PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(DIRECTORY jscalendar-1.0/ DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/zoneminder/www/tools/jscalendar)
 
+# Install zoneminder service files
 install(FILES zoneminder.logrotate DESTINATION /etc/logrotate.d RENAME zoneminder PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+install(FILES zoneminder.conf DESTINATION /etc/zm/www PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 
 if(ZM_WEB_USER STREQUAL "nginx")
-    install(FILES zoneminder.conf DESTINATION /etc/nginx/default.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
     install(FILES zoneminder.php-fpm.conf DESTINATION /etc/php-fpm.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ RENAME zoneminder.conf)
-else(ZM_WEB_USER STREQUAL "nginx")
-    install(FILES zoneminder.conf DESTINATION /etc/httpd/conf.d PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
 endif(ZM_WEB_USER STREQUAL "nginx")
 
 if(ZM_TARGET_DISTRO STREQUAL "el6")

distros/redhat/readme/README.Fedora

@@ -1,26 +1,8 @@
 What's New
 ==========
 
-1. ZoneMinder now uses a conf.d subfolder to process custom changes to
+1. See the ZoneMinder release notes for a list of new features:
-   variables found in zm.conf. Changes to zm.conf will be overwritten
+     https://github.com/ZoneMinder/zoneminder/releases
-   during an upgrade. Instead, create a file with a ".conf" extension under
-   the conf.d folder and make your changes there.
-   
-2. ZoneMinder now supports recording directly to video container! This feature
-   is new and should be treated as experimental. Refer to the documentation
-   regarding how to use this feature.
-
-3. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
-   "/cgi-bin-zm/zms". This has been to done to avoid this bug:
-   https://bugzilla.redhat.com/show_bug.cgi?id=973067
-
-   IMPORTANT: You must manually inspect the value for PATH_ZMS under Options
-   and verify it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result
-   in a broken system. You have been warned.
-
-4. This package uses the HTTPS protocol by default to access the web portal.
-   Requests using HTTP will auto-redirect to HTTPS. See README.https for
-   more information.
   
 New installs
 ============
@@ -82,16 +64,24 @@ New installs
    SELINUX line from "enforcing" to "disabled". This change will take
    effect after a reboot.
 
-6. Install mod_ssl or configure /etc/httpd/conf.d/zoneminder.conf to meet your
+6. Configure the web server
-   needs. This package comes preconfigured for HTTPS using the default self
-   signed certificate on your system. The recommended way to complete this step
-   is to simply install mod_ssl:
 
+   This package uses the HTTPS protocol by default to access the web portal,
+   using rhe default self signed certificate on your system. Requests using
+   HTTP will auto-redirect to HTTPS. 
+
+   Inspect the web server configuration file and verify it meets your needs:
+
+       /etc/zm/www/zoneminder.conf
+
+   If you are running other web enabled services then you may need to edit
+   this file to suite. See README.https to learn about other alternatives. 
+
+   When in doubt, proceed with the default:
+
+        sudo ln -s /etc/zm/www/zoneminder.conf /etc/httpd/conf.d/
 	sudo dnf install mod_ssl
 
-   If this does not meet your needs, then read README.https to
-   learn about alternatives. When in doubt, install mod_ssl.
-
 7. Now start the web server:
 
 	sudo systemctl enable httpd
@@ -131,7 +121,7 @@ Upgrades
    See step 2 of the Installation section to add missing permissions.
    
 3. Verify the ZoneMinder Apache configuration file in the folder 
-   /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
+   /etc/zm/www. You will have a file called "zoneminder.conf" and there
    may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
    exists, inspect it and merge anything new in that file with zoneminder.conf.
    Verify the SSL REquirements meet your needs. Read README.https if necessary.

distros/redhat/readme/README.Redhat6

@@ -1,7 +1,10 @@
 What's New
 ==========
 
-1. ***EOL NOTICE***
+1. See the ZoneMinder release notes for a list of new features:
+     https://github.com/ZoneMinder/zoneminder/releases
+
+2. ***EOL NOTICE***
    It has become increasingly difficult to maintain the ZoneMinder project such
    that it remains compatible with EL6 distros. The version of php shipped with
    EL6 distros and the version of ffmpeg which will build against EL6 are too
@@ -11,28 +14,7 @@ What's New
    replacing core packages, such as php, will not be supported by us. You are
    on your own should you choose to go down that path.
 
-2. ZoneMinder now uses a conf.d subfolder to process custom changes to
+3. The php package that ships with CentOS 6 does not support the new ZoneMinder
-   variables found in zm.conf. Changes to zm.conf will be overwritten
-   during an upgrade. Instead, create a file with a ".conf" extension under
-   th2 conf.d folder and make your changes there.
-
-3. ZoneMinder now supports recording directly to video container! This feature
-   is new and should be treated as experimental. Refer to the documentation
-   regarding how to use this feature.
-
-4. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
-   "/cgi-bin-zm/zms". This has been to done match the configuration of
-   CentOS7/Fedora and simplify the build process.
-
-   IMPORTANT: You must manually verify the value of PATH_ZMS under Options.
-   Make sure it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result
-   in a broken system. You have been warned.
-
-5. This package uses the HTTPS protocol by default to access the web portal.
-   Requests using HTTP will auto-redirect to HTTPS. See README.https for
-   more information.
-
-6. The php package that ships with CentOS 6 does not support the new ZoneMinder
    API. If you require API functionality (such as using a mobile app) then you
    should consider an upgrade to CentOS 7 or use Fedora.
 
@@ -81,15 +63,23 @@ New installs
    If you are not sure of the proper timezone specification to use, look at
    http://php.net/date.timezone
 
-5. Install mod_ssl or configure /etc/httpd/conf.d/zoneminder.conf to meet your
+5. Configure the web server
-   needs. This package comes preconfigured for HTTPS using the default self
-   signed certificate on your system. The recommended way to complete this step
-   is to simply install mod_ssl:
 
-	sudo yum install mod_ssl
+   This package uses the HTTPS protocol by default to access the web portal,
+   using rhe default self signed certificate on your system. Requests using
+   HTTP will auto-redirect to HTTPS. 
 
-   If this does not meet your needs, then read README.https to
+   Inspect the web server configuration file and verify it meets your needs:
-   learn about alternatives. When in doubt, install mod_ssl.
+
+       /etc/zm/www/zoneminder.conf
+
+   If you are running other web enabled services then you may need to edit
+   this file to suite. See README.https to learn about other alternatives. 
+
+   When in doubt, proceed with the default:
+
+        sudo ln -s /etc/zm/www/zoneminder.conf /etc/httpd/conf.d/
+	sudo dnf install mod_ssl
 
 6. Configure the web server to start automatically:
 
@@ -137,7 +127,7 @@ Upgrades
    See step 2 of the Installation section to add missing permissions.
 
 3. Verify the ZoneMinder Apache configuration file in the folder 
-   /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
+   /etc/zm/www. You will have a file called "zoneminder.conf" and there
    may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
    exists, inspect it and merge anything new in that file with zoneminder.conf.
    Verify the SSL REquirements meet your needs. Read README.https if necessary.

distros/redhat/readme/README.Redhat7

@@ -1,26 +1,8 @@
 What's New
 ==========
 
-1. ZoneMinder now uses a conf.d subfolder to process custom changes to
+1. See the ZoneMinder release notes for a list of new features:
-   variables found in zm.conf. Changes to zm.conf will be overwritten
+     https://github.com/ZoneMinder/zoneminder/releases
-   during an upgrade. Instead, create a file with a ".conf" extension under
-   the conf.d folder and make your changes there.
-   
-2. ZoneMinder now supports recording directly to video container! This feature
-   is new and should be treated as experimental. Refer to the documentation
-   regarding how to use this feature.
-
-3. The Apache ScriptAlias has been changed from "/cgi-bin/zm/zms" to 
-   "/cgi-bin-zm/zms". This has been to done to avoid this bug:
-   https://bugzilla.redhat.com/show_bug.cgi?id=973067
-
-   IMPORTANT: You must manually inspect the value for PATH_ZMS under Options
-   and verify it is set to "/cgi-bin-zm/nph-zms". Failure to do so will result
-   in a broken system. You have been warned.
-
-4. This package uses the HTTPS protocol by default to access the web portal.
-   Requests using HTTP will auto-redirect to HTTPS. See README.https for
-   more information.
 
 New installs
 ============
@@ -82,15 +64,23 @@ New installs
    SELINUX line from "enforcing" to "disabled". This change will take
    effect after a reboot.
 
-6. Install mod_ssl or configure /etc/httpd/conf.d/zoneminder.conf to meet your
+6. Configure the web server
-   needs. This package comes preconfigured for HTTPS using the default self
-   signed certificate on your system. The recommended way to complete this step
-   is to simply install mod_ssl:
 
-	sudo yum install mod_ssl
+   This package uses the HTTPS protocol by default to access the web portal,
+   using rhe default self signed certificate on your system. Requests using
+   HTTP will auto-redirect to HTTPS. 
 
-   If this does not meet your needs, then read README.https to
+   Inspect the web server configuration file and verify it meets your needs:
-   learn about alternatives. When in doubt, install mod_ssl.
+
+       /etc/zm/www/zoneminder.conf
+
+   If you are running other web enabled services then you may need to edit
+   this file to suite. See README.https to learn about other alternatives. 
+
+   When in doubt, proceed with the default:
+
+        sudo ln -s /etc/zm/www/zoneminder.conf /etc/httpd/conf.d/
+	sudo dnf install mod_ssl
 
 7. Now start the web server:
 
@@ -122,7 +112,7 @@ Upgrades
    See step 2 of the Installation section to add missing permissions.
 
 3. Verify the ZoneMinder Apache configuration file in the folder 
-   /etc/httpd/conf.d. You will have a file called "zoneminder.conf" and there
+   /etc/zm/www. You will have a file called "zoneminder.conf" and there
    may also be a file called "zoneminder.conf.rpmnew". If the rpmnew file
    exists, inspect it and merge anything new in that file with zoneminder.conf.
    Verify the SSL REquirements meet your needs. Read README.https if necessary.

distros/redhat/readme/README.https

@@ -1,29 +1,26 @@
-HTTPS is now a requirement
+HTTPS is now the default
-==========================
+========================
 
-This package now depends on Apache's mod_ssl package. This will automatically
+By default, ZoneMinder will use the certifciate created when the mod_ssl
-be installed along with ZoneMinder. Upon installation, the mod_ssl package
+pacakge was installed on your system. 
-will create a default, self-signed certificate. This is the certificate that
-ZoneMinder will use out of the box. 
 
 Since the certificate is self-signed, you will get a warning from your browser
 the first time you access the web portal. This is normal.
 
 This is not intended to be an all encompasing solution for everyone. ZoneMinder
 will work just fine over HTTPS the way it is currently configured. However,
-here are a couple of considerations you may want to take.
+here are a couple of considerations you may want to take to improve your
+experience.
 
-1. Create your own certificate. The CentOS wiki has a guide that describes how
+1. Install a fully signed certificate from letsencrypt, using certbot. See the
+   certbot site for more information. This free service is very easy to set up.
+   https://certbot.eff.org/all-instructions/  
+
+2. Create your own certificate. The CentOS wiki has a guide that describes how
    to do this: https://wiki.centos.org/HowTos/Https . Additionally, Googling 
-   "centos certificate" reveals many articles on the subject. Note that some
+   "centos certificate" reveals many articles on the subject.
-   third party applications, such as zmNinja, will require you to create a
-   certificate different than the default certificate on your machine.
 
-2. You can turn off HTTPS entirely by simply commenting out the SSLRequireSSL
+3. You can turn off HTTPS entirely by simply commenting out the SSLRequireSSL
    directives found in /etc/httpd/conf.d/zoneminder.conf. You should also
    comment out the HTTP -> HTTPS Rewrite rule.
 
-3. Install a fully signed certificate from letsencrypt. See the Letsencrypt
-   site for more information. https://letsencrypt.org/
-   This service is totally free!
-

distros/redhat/zoneminder.spec

@@ -9,9 +9,6 @@
 
 %if "%{zmuid_final}" == "nginx"
 %global with_nginx 1
-%global wwwconfdir %{_sysconfdir}/nginx/default.d
-%else
-%global wwwconfdir %{_sysconfdir}/httpd/conf.d
 %endif
 
 %global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
@@ -321,7 +318,7 @@ rm -rf %{_docdir}/%{name}-%{version}
 %config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm/conf.d/*.conf
 %ghost %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm/conf.d/zmcustom.conf
 
-%config(noreplace) %attr(644,root,root) %{wwwconfdir}/zoneminder.conf
+%config(noreplace) %attr(644,root,root) /etc/zm/www/zoneminder.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/zoneminder
 
 %if 0%{?with_nginx}

web/api/app/Plugin/Crud

@@ -1 +1 @@
-Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef
+Subproject commit c3976f1478c681b0bbc132ec3a3e82c3984eeed5