Merge branch 'master' into storageareas
This commit is contained in:
Isaac Connor
commit
8245d193e2
|
|
@ -1,4 +1,4 @@
|
|||
# CMakeLists.txt for the Redhat/CentOS Target Distro.
|
||||
# CMakeLists.txt for the Redhat Target Distros.
|
||||
|
||||
# Display a message to show the RHEL build options are being processed.
|
||||
if(ZM_TARGET_DISTRO MATCHES "^el")
|
||||
|
|
@ -20,11 +20,16 @@ if(ZM_WEB_USER STREQUAL "nginx")
|
|||
configure_file(nginx/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
|
||||
configure_file(nginx/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
|
||||
configure_file(nginx/zoneminder.php-fpm.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.php-fpm.conf @ONLY)
|
||||
configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README.Fedora COPYONLY)
|
||||
configure_file(nginx/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README COPYONLY)
|
||||
else(ZM_WEB_USER STREQUAL "nginx")
|
||||
configure_file(systemd/zoneminder.service.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.service @ONLY)
|
||||
configure_file(apache/zoneminder.conf.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.conf @ONLY)
|
||||
configure_file(systemd/zoneminder.tmpfiles.in ${CMAKE_CURRENT_SOURCE_DIR}/zoneminder.tmpfiles @ONLY)
|
||||
if( ZM_TARGET_DISTRO MATCHES "^fc")
|
||||
configure_file(readme/README.Fedora ${CMAKE_CURRENT_SOURCE_DIR}/readme/README COPYONLY)
|
||||
else( ZM_TARGET_DISTRO MATCHES "^fc")
|
||||
configure_file(readme/README.Redhat7 ${CMAKE_CURRENT_SOURCE_DIR}/readme/README COPYONLY)
|
||||
endif( ZM_TARGET_DISTRO MATCHES "^fc")
|
||||
endif(ZM_WEB_USER STREQUAL "nginx")
|
||||
|
||||
# Create several empty folders
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
%global with_apcu_bc 1
|
||||
%endif
|
||||
|
||||
%global readme_suffix %{?rhel:Redhat%{?rhel}}%{!?rhel:Fedora}
|
||||
%global _hardened_build 1
|
||||
|
||||
Name: zoneminder
|
||||
|
|
@ -203,8 +202,8 @@ fi
|
|||
%{_bindir}/gpasswd -a %{zmuid_final} dialout >/dev/null 2>&1 || :
|
||||
|
||||
# Warn the end user to read the README file
|
||||
echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, read README.%{readme_suffix} to finish the\ninstallation or upgrade!\n"
|
||||
echo -e "\nThe README file is located here: %{_docdir}/%{name}\n"
|
||||
echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, you must read the README file\nto finish the installation or upgrade!"
|
||||
echo -e "\nThe README file is located here: %{_pkgdocdir}/README\n"
|
||||
|
||||
%if 0%{?with_nginx}
|
||||
# Nginx does not create an SSL certificate like the apache package does so lets do that here
|
||||
|
|
@ -252,7 +251,7 @@ EOF
|
|||
|
||||
%files
|
||||
%license COPYING
|
||||
%doc AUTHORS README.md distros/redhat/readme/README.%{readme_suffix} distros/redhat/readme/README.https
|
||||
%doc AUTHORS README.md distros/redhat/readme/README distros/redhat/readme/README.https
|
||||
|
||||
# We want these two folders to have "normal" read permission
|
||||
# compared to the folder contents
|
||||
|
|
|
|||
|
|
@ -409,8 +409,8 @@ our @options = (
|
|||
that is used to get notifications for alarms detected by ZoneMinder
|
||||
in real time. zmNinja requires this server for push notifications to
|
||||
mobile phones. This option only enables the server if its already installed.
|
||||
Please visit https://github.com/pliablepixels/zmeventserver for installation
|
||||
instructions.
|
||||
Please visit the [zmeventserver project site](https://github.com/pliablepixels/zmeventserver)
|
||||
for installation instructions.
|
||||
`,
|
||||
type => $types{boolean},
|
||||
category => 'system',
|
||||
|
|
@ -442,7 +442,7 @@ our @options = (
|
|||
description => 'Your recaptcha site-key',
|
||||
help => q`You need to generate your keys from
|
||||
the Google reCaptcha website.
|
||||
Please refer to https://www.google.com/recaptcha/
|
||||
Please refer to the [recaptcha project site](https://www.google.com/recaptcha/)
|
||||
for more details.
|
||||
`,
|
||||
requires => [
|
||||
|
|
@ -457,7 +457,7 @@ our @options = (
|
|||
description => 'Your recaptcha secret-key',
|
||||
help => q`You need to generate your keys from
|
||||
the Google reCaptcha website.
|
||||
Please refer to https://www.google.com/recaptcha/
|
||||
Please refer to the [recaptcha project site](https://www.google.com/recaptcha/)
|
||||
for more details.
|
||||
`,
|
||||
requires => [
|
||||
|
|
@ -674,9 +674,9 @@ our @options = (
|
|||
ZoneMinder uses to view image streams on browsers such as
|
||||
Internet Explorer that don't natively support this format. If
|
||||
you use this browser it is highly recommended to install this
|
||||
from http://www.charliemouse.com/code/cambozola/ however if it
|
||||
is not installed still images at a lower refresh rate can still
|
||||
be viewed.
|
||||
from the [cambozola project site](http://www.charliemouse.com/code/cambozola/).
|
||||
However, if it is not installed still images at a lower refresh rate can
|
||||
still be viewed.
|
||||
`,
|
||||
type => $types{boolean},
|
||||
category => 'images',
|
||||
|
|
@ -690,9 +690,9 @@ our @options = (
|
|||
ZoneMinder uses to view image streams on browsers such as
|
||||
Internet Explorer that don't natively support this format. If
|
||||
you use this browser it is highly recommended to install this
|
||||
from http://www.charliemouse.com/code/cambozola/ however if it
|
||||
is not installed still images at a lower refresh rate can still
|
||||
be viewed. Leave this as 'cambozola.jar' if cambozola is
|
||||
from the [cambozola project site](http://www.charliemouse.com/code/cambozola/).
|
||||
However if it is not installed still images at a lower refresh rate can
|
||||
still be viewed. Leave this as 'cambozola.jar' if cambozola is
|
||||
installed in the same directory as the ZoneMinder web client
|
||||
files.
|
||||
`,
|
||||
|
|
@ -2721,7 +2721,8 @@ our @options = (
|
|||
This is being done for the sole purpoase of creating a better
|
||||
product for our target audience. This script is intended to be
|
||||
completely transparent to the end user, and can be disabled from
|
||||
the web console under Options.
|
||||
the web console under Options. For more details on what information
|
||||
we collect, please refer to our [privacy](?view=privacy) statement.
|
||||
`,
|
||||
type => $types{boolean},
|
||||
category => 'system',
|
||||
|
|
@ -3907,7 +3908,7 @@ our @options = (
|
|||
SSMTP is a lightweight and efficient method to send email.
|
||||
The SSMTP application is not installed by default.
|
||||
NEW_MAIL_MODULES must also be enabled.
|
||||
Please visit: http://www.zoneminder.com/wiki/index.php/How_to_get_ssmtp_working_with_Zoneminder
|
||||
Please visit the ZoneMinder [SSMTP Wiki page](http://www.zoneminder.com/wiki/index.php/How_to_get_ssmtp_working_with_Zoneminder)
|
||||
for setup and configuration help.
|
||||
`,
|
||||
type => $types{boolean},
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ $optionHelpIndex = preg_replace( '/^ZM_/', '', $_REQUEST['option'] );
|
|||
$optionHelpText = !empty($OLANG[$optionHelpIndex])?$OLANG[$optionHelpIndex]['Help']:$config[$_REQUEST['option']]['Help'];
|
||||
$optionHelpText = validHtmlStr($optionHelpText);
|
||||
$optionHelpText = preg_replace( "/~~/", "<br/>", $optionHelpText );
|
||||
$optionHelpText = preg_replace( "/\[(.+)\]\((.+)\)/", "<a href=\"$2\" target=\"_blank\">$1</a>", $optionHelpText );
|
||||
|
||||
$focusWindow = true;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue