diff -Nur -x '*.orig' -x '*.rej' smeserver-ocsinventory-0.1/createlinks mezzanine_patched_smeserver-ocsinventory-0.1/createlinks --- smeserver-ocsinventory-0.1/createlinks 2008-09-11 13:44:46.000000000 +0200 +++ mezzanine_patched_smeserver-ocsinventory-0.1/createlinks 2008-10-19 03:27:41.000000000 +0200 @@ -4,14 +4,14 @@ my $event = 'ocs-update'; -#templates2events("/etc/httpd/conf/httpd.conf", qw($event post-upgrade)); -#templates2events("/etc/my.cnf", $event); -#templates2events("/usr/share/ocsinventory-reports/ocsreports/db_config.inc.php", qw($event post-upgrade)); +templates2events("/etc/httpd/conf/httpd.conf", qw($event post-upgrade)); +templates2events("/etc/my.cnf", $event); +templates2events("/etc/ocsinventory/ocsinventory-reports/ocsreports/dbconfig.inc.php", qw($event post-upgrade)); event_link("ocs-conf", $event, "10"); safe_symlink("start", "root/etc/e-smith/events/$event/services2adjust/mysql.init"); safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysqld"); -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"); +safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/ocsinventory/ocsinventory-reports/dbconfig.inc.php/template-begin"); 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 --- smeserver-ocsinventory-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/97ocs 2008-10-19 03:31:32.000000000 +0200 +++ 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 @@ -29,7 +29,7 @@ order deny,allow deny from all allow from {"$localAccess $externalSSLAccess";} - php_admin_value open_basedir /usr/share/ocsinventory-reports:/tmp:/var/lib/mysql/mysql.sock:/var/lib/ocsinventory-server/ + php_admin_value open_basedir /usr/share/ocsinventory-reports:/tmp:/var/lib/mysql/mysql.sock:/var/lib/ocsinventory-server/:/etc/ocsinventory/ocsinventory-reports php_admin_value post_max_size { ($ocs{MaxUpload} || '30M') ;} php_admin_value upload_max_filesize { ($ocs{MaxUpload} || '30M') ;} php_admin_value memory_limit { ($ocs{MaxUpload} || '30M') ;} @@ -60,7 +60,7 @@ my $version = 'unknown'; my $modPerl = `rpm -q mod_perl`; $modPerl =~ /^mod_perl-(\d*)/; - $version = $1. + $version = $1; if ($version =~ /^1/){ $version = 1; } 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 --- 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 +++ 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 @@ -0,0 +1,4 @@ +$_SESSION["SERVEUR_SQL"]="localhost"; +$_SESSION["COMPTE_BASE"]="{ $ocs{'DbUser'} }"; +$_SESSION["PSWD_BASE"]="{ $ocs{'DbPassword'} }"; + 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 --- 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 +++ 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 @@ -0,0 +1 @@ +?> 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 --- 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 +++ 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 @@ -1,4 +0,0 @@ -$_SESSION["SERVEUR_SQL"]="localhost"; -$_SESSION["COMPTE_BASE"]="{ $ocs{'DbUser'} }"; -$_SESSION["PSWD_BASE"]="{ $ocs{'DbPassword'} }"; - 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 --- 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 +++ 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 @@ -1 +0,0 @@ -?> 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 --- 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 +++ 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 @@ -0,0 +1,3 @@ +UID="root" +GID="www" +PERMS=0660 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 --- 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 +++ 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 @@ -1,3 +0,0 @@ -UID="root" -GID="www" -PERMS=0660