summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-misc/zoneminder/files')
-rw-r--r--www-misc/zoneminder/files/10_zoneminder.conf20
-rw-r--r--www-misc/zoneminder/files/README.gentoo12
-rw-r--r--www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch16
3 files changed, 31 insertions, 17 deletions
diff --git a/www-misc/zoneminder/files/10_zoneminder.conf b/www-misc/zoneminder/files/10_zoneminder.conf
index 277d680d24b..eb9961d1322 100644
--- a/www-misc/zoneminder/files/10_zoneminder.conf
+++ b/www-misc/zoneminder/files/10_zoneminder.conf
@@ -1,18 +1,16 @@
-ScriptAlias /cgi-bin/zms "/usr/libexec/zoneminder/cgi-bin/zms"
-ScriptAlias /cgi-bin/nph-zms "/usr/libexec/zoneminder/cgi-bin/nph-zms"
+ScriptAlias /zm/cgi-bin "/usr/libexec/zoneminder/cgi-bin/"
<Directory "/usr/libexec/zoneminder/cgi-bin">
AllowOverride All
- Options ExecCGI
- Order allow,deny
- Allow from all
-</Directory>
+ Options +ExecCGI
+ Require all granted
+</Directory>
-Alias /zoneminder "%ZM_WEBDIR%"
+Alias /zm "%ZM_WEBDIR%"
<Directory "%ZM_WEBDIR%">
- Options -Indexes MultiViews FollowSymLinks
+ Options -Indexes +MultiViews +FollowSymLinks
AllowOverride All
- Order allow,deny
- Allow from all
-</Directory>
+ Require all granted
+</Directory>
+
diff --git a/www-misc/zoneminder/files/README.gentoo b/www-misc/zoneminder/files/README.gentoo
index 07995214d1c..8713fda6f78 100644
--- a/www-misc/zoneminder/files/README.gentoo
+++ b/www-misc/zoneminder/files/README.gentoo
@@ -3,12 +3,12 @@
(see https://wiki.gentoo.org/wiki/MySQL/Startup_Guide).
E.g., when logged into mysql as root,
mysql> CREATE DATABASE \`zm\`;
- mysql> GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'topsecretpassword';
+ mysql> grant select,insert,alter,update,lock tables,delete on zm.* to 'zmuser'@localhost identified by 'zmpass';
+ mysql> flush privileges;
Once you completed that you should execute the following:
- cd /usr/share/zoneminder
- mysql -u zmuser -p < db/zm_create.sql
+ mysql -p < /usr/share/zoneminder/db/zm_create.sql
-2. Set your database settings in /etc/zm.conf, including above topsecretpassword
+2. Set your database settings in /etc/zm.conf, including above zmpass
3. Configure apache to use zoneminder, see /usr/share/doc/zoneminder*/10_zoneminder.conf
for an example configuration snippet.
@@ -23,5 +23,5 @@
6. Finally point your browser to http://your.webserver/zm
-If you are upgrading, you will need to run the zmupdate.pl script:
- /usr/bin/zmupdate.pl --version=oldversionnumber [--user=zmuser --pass=topsecretpassword]
+If you are upgrading, you will need to run the zmupdate.pl script:
+ /usr/bin/zmupdate.pl
diff --git a/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch b/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch
new file mode 100644
index 00000000000..54772a14769
--- /dev/null
+++ b/www-misc/zoneminder/files/zoneminder-1.30.4-path_zms.patch
@@ -0,0 +1,16 @@
+duplicate the work of utils/zmeditconfigdata.sh
+https://github.com/ZoneMinder/ZoneMinder/commit/5a59a0375dd19f8e5af9b2acadec9f2bb16ee56c
+
+diff -ruN ZoneMinder-1.30.4.orig/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in ZoneMinder-1.30.4/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+--- ZoneMinder-1.30.4.orig/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in 2017-08-30 14:55:31.894727925 +0100
++++ ZoneMinder-1.30.4/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in 2017-08-30 14:57:05.050731752 +0100
+@@ -507,7 +507,7 @@
+ },
+ {
+ name => "ZM_PATH_ZMS",
+- default => "/cgi-bin/nph-zms",
++ default => "/zm/cgi-bin/nph-zms",
+ description => "Web path to zms streaming server",
+ help => qqq("
+ The ZoneMinder streaming server is required to send streamed
+