/[smecontribs]/rpms/smeserver-zoneminder/contribs9/smeserver-zoneminder-1.0-bz10539-initial_fixes.patch
ViewVC logotype

Annotation of /rpms/smeserver-zoneminder/contribs9/smeserver-zoneminder-1.0-bz10539-initial_fixes.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (hide annotations) (download)
Tue Mar 13 16:10:53 2018 UTC (6 years, 2 months ago) by jpp
Branch: MAIN 
* Tue Mar 13 2018 Jean-Philipe Pialasse <tests@pialasse.com> 1.0-3.sme
- fix few bugs on initial release [SME: 10539]
- fix auth using SME Server admin user and pass for http auth
1 jpp 1.1 diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/db/accounts/zm/type smeserver-zoneminder-1.0/root/etc/e-smith/db/accounts/zm/type
2     --- smeserver-zoneminder-1.0.old/root/etc/e-smith/db/accounts/zm/type 1969-12-31 19:00:00.000000000 -0500
3     +++ smeserver-zoneminder-1.0/root/etc/e-smith/db/accounts/zm/type 2008-09-20 08:08:22.000000000 -0400
4     @@ -0,0 +1 @@
5     +url
6     diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/db/configuration/migrate/zoneminder smeserver-zoneminder-1.0/root/etc/e-smith/db/configuration/migrate/zoneminder
7     --- smeserver-zoneminder-1.0.old/root/etc/e-smith/db/configuration/migrate/zoneminder 2018-03-12 23:41:05.000000000 -0400
8     +++ smeserver-zoneminder-1.0/root/etc/e-smith/db/configuration/migrate/zoneminder 2018-03-13 10:57:17.846000000 -0400
9     @@ -6,3 +6,4 @@
10    
11     my $managerpass = $zoneminder->prop('ManagerPassword') ||
12     $zoneminder->set_prop('ManagerPassword', `/usr/bin/openssl rand -base64 10 | /usr/bin/tr -c -d '[:alnum:]'`);
13     +}
14     diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/db/defaults/zm/type smeserver-zoneminder-1.0/root/etc/e-smith/db/defaults/zm/type
15     --- smeserver-zoneminder-1.0.old/root/etc/e-smith/db/defaults/zm/type 2008-09-20 08:08:22.000000000 -0400
16     +++ smeserver-zoneminder-1.0/root/etc/e-smith/db/defaults/zm/type 1969-12-31 19:00:00.000000000 -0500
17     @@ -1 +0,0 @@
18     -url
19     diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/events/actions/zoneminder smeserver-zoneminder-1.0/root/etc/e-smith/events/actions/zoneminder
20     --- smeserver-zoneminder-1.0.old/root/etc/e-smith/events/actions/zoneminder 2018-03-13 00:07:18.000000000 -0400
21     +++ smeserver-zoneminder-1.0/root/etc/e-smith/events/actions/zoneminder 2018-03-13 11:45:17.145000000 -0400
22     @@ -1,7 +1,15 @@
23     #!/bin/bash
24    
25     -# restart mysql.init
26     +# check if inodb is enabled for up to SME9
27     +innodb=$(/sbin/e-smith/db configuration getprop mysqld InnoDB || echo "disabled")
28     +if [[ "$innodb" != "enabled" ]]; then
29     + /sbin/e-smith/db configuration setprop mysqld InnoDB enabled
30     + /sbin/e-smith/expand-template /etc/my.cnf
31     + sv t /service/mysqld
32     + sleep 8
33     +fi
34    
35     +# restart mysql.init
36     /sbin/service zoneminder stop 1>/dev/null
37     /sbin/service mysql.init restart 1>/dev/null
38     /sbin/service zoneminder start 1>/dev/null
39     diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30zoneminder smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/e-smith/sql/init/30zoneminder
40     --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30zoneminder 2018-03-12 23:38:41.000000000 -0400
41     +++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/e-smith/sql/init/30zoneminder 2018-03-13 11:13:01.587000000 -0400
42     @@ -21,7 +21,7 @@
43    
44    
45    
46     -/usr/bin/mysql $dbname -e 'insert into Users VALUES (NULL,'admin',password('$ManagerPassword'),'',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','')
47     +/usr/bin/mysql $dbname -e 'insert into Users VALUES (NULL,"admin",password("$ManagerPassword"),"",1,"View","Edit","Edit","Edit","Edit","Edit","Edit","","")
48     ON DUPLICATE KEY UPDATE `Password` = password("$ManagerPassword");'
49    
50     /usr/bin/mysql <<EOF
51     diff -Nur smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder
52     --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder 2018-03-12 23:03:11.000000000 -0400
53     +++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder 2018-03-13 12:04:27.235000000 -0400
54     @@ -8,6 +8,7 @@
55     Allow from all
56     AuthName "Zoneminder"
57     AuthType Basic
58     + AuthBasicProvider external
59     AuthExternal pwauth
60     require user admin
61     </Directory>
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed