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

Contents 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.2 - (show annotations) (download)
Tue Mar 13 16:13:43 2018 UTC (6 years, 7 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-zoneminder-1_0-4_el6_sme, smeserver-zoneminder-1_0-7_el6_sme, smeserver-zoneminder-1_0-3_el6_sme, smeserver-zoneminder-1_0-6_el6_sme, smeserver-zoneminder-1_0-5_el6_sme, HEAD
Changes since 1.1: +15 -0 lines 
* 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
- add setting of mysql for innodb
1 diff -Nur smeserver-zoneminder-1.0.old/createlinks smeserver-zoneminder-1.0/createlinks
2 --- smeserver-zoneminder-1.0.old/createlinks 2018-03-13 00:21:52.000000000 -0400
3 +++ smeserver-zoneminder-1.0/createlinks 2018-03-13 12:13:18.355000000 -0400
4 @@ -17,7 +17,9 @@
5 safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
6
7 # add expand zm.conf
8 -foreach my $event (qw(bootstrap-console-save console-save remoteaccess-update php-update webapps-update)){
9 +foreach my $event (qw(post-upgrade bootstrap-console-save console-save remoteaccess-update php-update webapps-update)){
10 templates2events("/etc/zm/zm.conf", $event);
11 - safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zoneminder");
12 + event_link("zoneminder", $event, "10");
13 }
14 +
15 +
16 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
17 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/db/accounts/zm/type 1969-12-31 19:00:00.000000000 -0500
18 +++ smeserver-zoneminder-1.0/root/etc/e-smith/db/accounts/zm/type 2008-09-20 08:08:22.000000000 -0400
19 @@ -0,0 +1 @@
20 +url
21 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
22 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/db/configuration/migrate/zoneminder 2018-03-12 23:41:05.000000000 -0400
23 +++ smeserver-zoneminder-1.0/root/etc/e-smith/db/configuration/migrate/zoneminder 2018-03-13 10:57:17.846000000 -0400
24 @@ -6,3 +6,4 @@
25
26 my $managerpass = $zoneminder->prop('ManagerPassword') ||
27 $zoneminder->set_prop('ManagerPassword', `/usr/bin/openssl rand -base64 10 | /usr/bin/tr -c -d '[:alnum:]'`);
28 +}
29 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
30 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/db/defaults/zm/type 2008-09-20 08:08:22.000000000 -0400
31 +++ smeserver-zoneminder-1.0/root/etc/e-smith/db/defaults/zm/type 1969-12-31 19:00:00.000000000 -0500
32 @@ -1 +0,0 @@
33 -url
34 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
35 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/events/actions/zoneminder 2018-03-13 00:07:18.000000000 -0400
36 +++ smeserver-zoneminder-1.0/root/etc/e-smith/events/actions/zoneminder 2018-03-13 11:45:17.145000000 -0400
37 @@ -1,7 +1,15 @@
38 #!/bin/bash
39
40 -# restart mysql.init
41 +# check if inodb is enabled for up to SME9
42 +innodb=$(/sbin/e-smith/db configuration getprop mysqld InnoDB || echo "disabled")
43 +if [[ "$innodb" != "enabled" ]]; then
44 + /sbin/e-smith/db configuration setprop mysqld InnoDB enabled
45 + /sbin/e-smith/expand-template /etc/my.cnf
46 + sv t /service/mysqld
47 + sleep 8
48 +fi
49
50 +# restart mysql.init
51 /sbin/service zoneminder stop 1>/dev/null
52 /sbin/service mysql.init restart 1>/dev/null
53 /sbin/service zoneminder start 1>/dev/null
54 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
55 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/e-smith/sql/init/30zoneminder 2018-03-12 23:38:41.000000000 -0400
56 +++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/e-smith/sql/init/30zoneminder 2018-03-13 11:13:01.587000000 -0400
57 @@ -21,7 +21,7 @@
58
59
60
61 -/usr/bin/mysql $dbname -e 'insert into Users VALUES (NULL,'admin',password('$ManagerPassword'),'',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','')
62 +/usr/bin/mysql $dbname -e 'insert into Users VALUES (NULL,"admin",password("$ManagerPassword"),"",1,"View","Edit","Edit","Edit","Edit","Edit","Edit","","")
63 ON DUPLICATE KEY UPDATE `Password` = password("$ManagerPassword");'
64
65 /usr/bin/mysql <<EOF
66 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
67 --- smeserver-zoneminder-1.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder 2018-03-12 23:03:11.000000000 -0400
68 +++ smeserver-zoneminder-1.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86zoneminder 2018-03-13 12:04:27.235000000 -0400
69 @@ -8,6 +8,7 @@
70 Allow from all
71 AuthName "Zoneminder"
72 AuthType Basic
73 + AuthBasicProvider external
74 AuthExternal pwauth
75 require user admin
76 </Directory>
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed