ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into swresample

This commit is contained in:
Isaac Connor 2018-12-20 09:16:27 -05:00
parent 3a068ae6a3 622c17f628
commit d4fb85a9aa
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distros/redhat/nginx/zoneminder.nginx.conf.in
View File

@ -21,7 +21,7 @@ server {
include /etc/nginx/fastcgi_params; include /etc/nginx/fastcgi_params;
fastcgi_param SCRIPT_FILENAME $request_filename; fastcgi_param SCRIPT_FILENAME $request_filename;
fastcgi_pass unix:/run/fcgiwrap.sock; fastcgi_pass unix:/run/fcgiwrap/fcgiwrap-nginx.sock;
} }
location /zm/cache { location /zm/cache {

5
distros/redhat/readme/README.httpd
View File

@ -146,13 +146,8 @@ Upgrades
See step 6 of the installation section if you have not already done this See step 6 of the installation section if you have not already done this
during a previous upgrade. during a previous upgrade.
<<<<<<< HEAD
If this step is not performed correctly, the web console will appear
mostly empty and/or significantly corrupted post-upgrade.
=======
IMPORTANT: Failure to complete this step properly will result in a mostly IMPORTANT: Failure to complete this step properly will result in a mostly
empty or significantly corrupted web console post-upgrade. empty or significantly corrupted web console post-upgrade.
>>>>>>> 5b211d250910918782d20bf32b0e33a38a0df4dd
4. Upgrade the database before starting ZoneMinder. 4. Upgrade the database before starting ZoneMinder.

3
web/api/app/Controller/HostController.php
View File

@ -71,7 +71,8 @@ class HostController extends AppController {
$zmAuthRelay = $this->Config->find('first',array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_RELAY')))['Config']['Value']; $zmAuthRelay = $this->Config->find('first',array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_RELAY')))['Config']['Value'];
if ( $zmAuthRelay == 'hashed' ) { if ( $zmAuthRelay == 'hashed' ) {
$zmAuthHashIps = $this->Config->find('first',array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_HASH_IPS')))['Config']['Value']; $zmAuthHashIps = $this->Config->find('first',array('conditions' => array('Config.' . $this->Config->primaryKey => 'ZM_AUTH_HASH_IPS')))['Config']['Value'];
$credentials = 'auth='.generateAuthHash($zmAuthHashIps); // make sure auth is regenerated each time we call this API
$credentials = 'auth='.generateAuthHash($zmAuthHashIps,true);
} else { } else {
// user will need to append the store password here // user will need to append the store password here
$credentials = 'user='.$this->Session->read('user.Username').'&pass='; $credentials = 'user='.$this->Session->read('user.Username').'&pass=';