Merge branch 'master' into patch-474778

ZoneMinder · Nov 24, 2024 · 0c568c9 · 0c568c9
2 parents 5f6e9a8 + 7bcb588
commit 0c568c9
Show file tree

Hide file tree

Showing 24 changed files with 493 additions and 312 deletions.
diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
@@ -3,9 +3,9 @@ Ubuntu
 
 .. contents::
 
-Ubuntu 22.04 (Jammy)
---------------------
-These instructions are for a brand new ubuntu 22.04 LTS system which does not have ZM installed.
+Ubuntu 22.04+ (Jammy)
+---------------------
+These instructions are for a brand new ubuntu 22.04 LTS system or newer which does not have ZM installed.
 
 **Step 1:** Update system
 
@@ -27,30 +27,51 @@ To use this repository instead of the official Ubuntu repository, enter the foll
         sudo add-apt-repository ppa:iconnor/zoneminder-1.36
         sudo apt update
 
-**Step 3:** Install Zoneminder
+**Step 3:** Configuration MySQL/MariaDB
+
+::
+
+	apt-get install mysql-server
+
+Alternatively
+
+::
+
+  apt-get install mariab-server
+
+**Step 4:** Configure the ZoneMinder Database
+
+This step is not required if you are using our ppa packages as they will do it for you.  It is ok to do it yourself though.
+
+::
+
+	sudo mysql --defaults-file=/etc/mysql/debian.cnf -p < /usr/share/zoneminder/db/zm_create.sql
+	sudo mysql --defaults-file=/etc/mysql/debian.cnf -p -e "grant lock tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute,references on zm.* to 'zmuser'@localhost identified by 'zmpass';"
+
+**Step 5:** Install Zoneminder
 
 ::
 
         sudo apt install -y zoneminder
 
 
-**Step 4:** Configure Apache correctly:
+**Step 6:** Configure Apache correctly:
 
 ::
         
-        sudo a2enmod rewrite
+        sudo a2enmod rewrite headers cgi
         sudo a2enconf zoneminder
         sudo systemctl restart apache2
 
 
-**Step 5:** Enable and start zoneminder
+**Step 7:** Enable and start zoneminder
 
 ::
 
         sudo systemctl enable zoneminder
         sudo systemctl start zoneminder
 
-**Step 6:** Open Zoneminder
+**Step 8:** Open Zoneminder
 
 Open up a browser and go to ``http://hostname_or_ip/zm`` to open the ZoneMinder Console.
 

diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -287,7 +287,7 @@ our @options = (
       limited by their defined permissions.
       `,
     type        => $types{boolean},
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_AUTH_TYPE',
@@ -311,7 +311,7 @@ our @options = (
       pattern     => qr|^([br])|i,
       format      => q( $1 =~ /^b/ ? 'builtin' : 'remote' )
     },
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_CASE_INSENSITIVE_USERNAMES',
@@ -323,7 +323,7 @@ our @options = (
       `,
     requires    => [ { name=>'ZM_OPT_USE_AUTH', value=>'yes' } ],
     type        => $types{boolean},
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_AUTH_RELAY',
@@ -348,7 +348,7 @@ our @options = (
       pattern     => qr|^([hpn])|i,
       format      => q( ($1 =~ /^h/) ? 'hashed' : ($1 =~ /^p/ ? 'plain' : 'none' ) )
     },
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_AUTH_HASH_SECRET',
@@ -367,7 +367,7 @@ our @options = (
     ],
     type        => $types{string},
     private     => 1,
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_AUTH_HASH_IPS',
@@ -390,7 +390,7 @@ our @options = (
       { name=>'ZM_AUTH_RELAY', value=>'hashed' }
     ],
     type        => $types{boolean},
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_AUTH_HASH_TTL',
@@ -405,7 +405,7 @@ our @options = (
       { name=>'ZM_AUTH_RELAY', value=>'hashed' }
     ],
     type        => $types{integer},
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_AUTH_HASH_LOGINS',
@@ -431,7 +431,7 @@ our @options = (
       { name=>'ZM_AUTH_RELAY', value=>'hashed' }
     ],
     type        => $types{boolean},
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_RTSP2WEB_PATH',
@@ -497,7 +497,7 @@ our @options = (
       if you are exposing your ZM instance on the Internet.
       `,
     type        => $types{boolean},
-    category    => 'system',
+    category    => 'api',
   },
   {
     name        => 'ZM_OPT_USE_LEGACY_API_AUTH',
@@ -508,7 +508,7 @@ our @options = (
       Authentication mechanism using JWT tokens. Older versions used a less secure MD5 based auth hash. It is recommended you turn this off after you are sure you don't need it. If you are using a 3rd party app that relies on the older API auth mechanisms, you will have to update that app if you turn this off. Note that zmNinja 1.3.057 onwards supports the new token system
       `,
     type        => $types{boolean},
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_OPT_USE_EVENTNOTIFICATION',
@@ -545,7 +545,7 @@ our @options = (
                      {name=>'ZM_OPT_USE_AUTH', value=>'yes'}
                    ],
     type        => $types{boolean},
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_OPT_GOOG_RECAPTCHA_SITEKEY',
@@ -560,7 +560,7 @@ our @options = (
                    ],
     type        => $types{string},
     private     => 1,
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        => 'ZM_OPT_GOOG_RECAPTCHA_SECRETKEY',
@@ -576,7 +576,7 @@ our @options = (
                    ],
     type        => $types{string},
     private     => 1,
-    category    => 'system',
+    category    => 'auth',
   },
   {
     name        =>  'ZM_OPT_USE_GEOLOCATION',