1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-ocsinventory-0.1/createlinks mezzanine_patched_smeserver-ocsinventory-0.1/createlinks |
2 |
|
|
--- smeserver-ocsinventory-0.1/createlinks 2008-09-11 13:44:46.000000000 +0200 |
3 |
|
|
+++ mezzanine_patched_smeserver-ocsinventory-0.1/createlinks 2008-10-19 03:27:41.000000000 +0200 |
4 |
|
|
@@ -4,14 +4,14 @@ |
5 |
|
|
|
6 |
|
|
|
7 |
|
|
my $event = 'ocs-update'; |
8 |
|
|
-#templates2events("/etc/httpd/conf/httpd.conf", qw($event post-upgrade)); |
9 |
|
|
-#templates2events("/etc/my.cnf", $event); |
10 |
|
|
-#templates2events("/usr/share/ocsinventory-reports/ocsreports/db_config.inc.php", qw($event post-upgrade)); |
11 |
|
|
+templates2events("/etc/httpd/conf/httpd.conf", qw($event post-upgrade)); |
12 |
|
|
+templates2events("/etc/my.cnf", $event); |
13 |
|
|
+templates2events("/etc/ocsinventory/ocsinventory-reports/ocsreports/dbconfig.inc.php", qw($event post-upgrade)); |
14 |
|
|
|
15 |
|
|
event_link("ocs-conf", $event, "10"); |
16 |
|
|
safe_symlink("start", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); |
17 |
|
|
safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); |
18 |
|
|
safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysqld"); |
19 |
|
|
|
20 |
|
|
-safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php/template-begin"); |
21 |
|
|
+safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php/template-begin"); |
22 |
|
|
|
23 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs |
24 |
|
|
--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs 2008-10-19 03:31:32.000000000 +0200 |
25 |
|
|
+++ mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs 2008-10-19 03:28:15.000000000 +0200 |
26 |
|
|
@@ -29,7 +29,7 @@ |
27 |
|
|
order deny,allow |
28 |
|
|
deny from all |
29 |
|
|
allow from {"$localAccess $externalSSLAccess";} |
30 |
|
|
- php_admin_value open_basedir /usr/share/ocsinventory-reports:/tmp:/var/lib/mysql/mysql.sock:/var/lib/ocsinventory-server/ |
31 |
|
|
+ php_admin_value open_basedir /usr/share/ocsinventory-reports:/tmp:/var/lib/mysql/mysql.sock:/var/lib/ocsinventory-server/:/etc/ocsinventory/ocsinventory-reports |
32 |
|
|
php_admin_value post_max_size { ($ocs{MaxUpload} || '30M') ;} |
33 |
|
|
php_admin_value upload_max_filesize { ($ocs{MaxUpload} || '30M') ;} |
34 |
|
|
php_admin_value memory_limit { ($ocs{MaxUpload} || '30M') ;} |
35 |
|
|
@@ -60,7 +60,7 @@ |
36 |
|
|
my $version = 'unknown'; |
37 |
|
|
my $modPerl = `rpm -q mod_perl`; |
38 |
|
|
$modPerl =~ /^mod_perl-(\d*)/; |
39 |
|
|
- $version = $1. |
40 |
|
|
+ $version = $1; |
41 |
|
|
if ($version =~ /^1/){ |
42 |
|
|
$version = 1; |
43 |
|
|
} |
44 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php/all mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php/all |
45 |
|
|
--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php/all 1970-01-01 01:00:00.000000000 +0100 |
46 |
|
|
+++ mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php/all 2008-09-10 16:59:37.000000000 +0200 |
47 |
|
|
@@ -0,0 +1,4 @@ |
48 |
|
|
+$_SESSION["SERVEUR_SQL"]="localhost"; |
49 |
|
|
+$_SESSION["COMPTE_BASE"]="{ $ocs{'DbUser'} }"; |
50 |
|
|
+$_SESSION["PSWD_BASE"]="{ $ocs{'DbPassword'} }"; |
51 |
|
|
+ |
52 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php/template-end mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php/template-end |
53 |
|
|
--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php/template-end 1970-01-01 01:00:00.000000000 +0100 |
54 |
|
|
+++ mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php/template-end 2008-09-11 09:53:26.000000000 +0200 |
55 |
|
|
@@ -0,0 +1 @@ |
56 |
|
|
+?> |
57 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-ocsinventory-0.1/root/etc/e-smith/templates/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php/all mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php/all |
58 |
|
|
--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php/all 2008-09-10 16:59:37.000000000 +0200 |
59 |
|
|
+++ mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php/all 1970-01-01 01:00:00.000000000 +0100 |
60 |
|
|
@@ -1,4 +0,0 @@ |
61 |
|
|
-$_SESSION["SERVEUR_SQL"]="localhost"; |
62 |
|
|
-$_SESSION["COMPTE_BASE"]="{ $ocs{'DbUser'} }"; |
63 |
|
|
-$_SESSION["PSWD_BASE"]="{ $ocs{'DbPassword'} }"; |
64 |
|
|
- |
65 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-ocsinventory-0.1/root/etc/e-smith/templates/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php/template-end mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php/template-end |
66 |
|
|
--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php/template-end 2008-09-11 09:53:26.000000000 +0200 |
67 |
|
|
+++ mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php/template-end 1970-01-01 01:00:00.000000000 +0100 |
68 |
|
|
@@ -1 +0,0 @@ |
69 |
|
|
-?> |
70 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-ocsinventory-0.1/root/etc/e-smith/templates.metadata/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates.metadata/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php |
71 |
|
|
--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates.metadata/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php 1970-01-01 01:00:00.000000000 +0100 |
72 |
|
|
+++ mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates.metadata/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php 2008-10-19 03:30:37.000000000 +0200 |
73 |
|
|
@@ -0,0 +1,3 @@ |
74 |
|
|
+UID="root" |
75 |
|
|
+GID="www" |
76 |
|
|
+PERMS=0660 |
77 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-ocsinventory-0.1/root/etc/e-smith/templates.metadata/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates.metadata/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php |
78 |
|
|
--- smeserver-ocsinventory-0.1/root/etc/e-smith/templates.metadata/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php 2008-09-11 00:00:37.000000000 +0200 |
79 |
|
|
+++ mezzanine_patched_smeserver-ocsinventory-0.1/root/etc/e-smith/templates.metadata/usr/share/ocsinventory-reports/ocsreports/dbconfig.inc.php 1970-01-01 01:00:00.000000000 +0100 |
80 |
|
|
@@ -1,3 +0,0 @@ |
81 |
|
|
-UID="root" |
82 |
|
|
-GID="www" |
83 |
|
|
-PERMS=0660 |