/[smecontribs]/rpms/smeserver-cacti/contribs10/smeserver-cacti-1.1.19-sme10.patch
ViewVC logotype

Diff of /rpms/smeserver-cacti/contribs10/smeserver-cacti-1.1.19-sme10.patch

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

Revision 1.1 by jpp, Tue Jul 26 04:09:02 2022 UTC Revision 1.2 by jpp, Tue Jul 26 04:35:57 2022 UTC
# Line 1  Line 1 
1  diff -Nur --no-dereference smeserver-cacti-1.1.19.old/createlinks smeserver-cacti-1.1.19/createlinks  diff -Nur --no-dereference smeserver-cacti-1.1.19.old/createlinks smeserver-cacti-1.1.19/createlinks
2  --- smeserver-cacti-1.1.19.old/createlinks      2014-06-16 11:53:01.000000000 -0400  --- smeserver-cacti-1.1.19.old/createlinks      2014-06-16 11:53:01.000000000 -0400
3  +++ smeserver-cacti-1.1.19/createlinks  2022-07-26 00:03:16.700000000 -0400  +++ smeserver-cacti-1.1.19/createlinks  2022-07-26 00:15:21.267000000 -0400
4  @@ -5,6 +5,7 @@  @@ -5,6 +5,7 @@
5   for my $event (qw(   for my $event (qw(
6       post-upgrade       post-upgrade
# Line 23  diff -Nur --no-dereference smeserver-cac Line 23  diff -Nur --no-dereference smeserver-cac
23  +  /etc/e-smith/sql/init/80cacti  +  /etc/e-smith/sql/init/80cacti
24  +));  +));
25  +  +
26  +event_services($event, qw(  +event_services($event,
27  +  crond restart  +  'crond' => 'restart',
28  +  mysql.init restart  +  'mysql.init' => 'restart',
29  +  httpd-e-smith sigusr1  +  'httpd-e-smith' => 'sigusr1',
30  +  php74-php-fpm reload-or-restart  +  'php74-php-fpm' => 'reload-or-restart'
31  +));  +);
32  +  +
33  +#backup ?  +#backup ?
34  +#use esmith::Build::Backup qw(:all);  +#use esmith::Build::Backup qw(:all);
# Line 36  diff -Nur --no-dereference smeserver-cac Line 36  diff -Nur --no-dereference smeserver-cac
36  +#  +#
37  +#));  +#));
38  +  +
39    diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80cacti smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/e-smith/sql/init/80cacti
40    --- smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/e-smith/sql/init/80cacti  2019-12-11 14:46:28.000000000 -0500
41    +++ smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/e-smith/sql/init/80cacti      2022-07-26 00:29:43.464000000 -0400
42    @@ -3,7 +3,7 @@
43         my $user = $cacti{DbUser} || 'cacti';
44         my $pass = $cacti{DbPassword} || 'changeme';
45         $OUT .= <<END
46    -#! /bin/sh
47    +#!/bin/bash
48         if [ -d /var/lib/mysql/$db ]; then
49           exit
50         fi
51    @@ -19,4 +19,4 @@
52         /usr/bin/mysql_tzinfo_to_sql /usr/share/zoneinfo/ 2>/dev/null |/usr/bin/mysql mysql
53         /usr/bin/mysql $db < /etc/e-smith/db/configuration/migrate/80cacti_sme.sql
54     END
55    -}
56    \ Pas de fin de ligne à la fin du fichier
57    +}
58  diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti  diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti
59  --- smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti     2014-06-16 11:53:00.000000000 -0400  --- smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti     2014-06-16 11:53:00.000000000 -0400
60  +++ smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti 2022-07-26 00:04:03.542000000 -0400  +++ smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti 2022-07-26 00:30:15.300000000 -0400
61  @@ -5,32 +5,19 @@  @@ -5,32 +5,19 @@
62       SSLRequireSSL       SSLRequireSSL
63       Options -Indexes       Options -Indexes
# Line 61  diff -Nur --no-dereference smeserver-cac Line 80  diff -Nur --no-dereference smeserver-cac
80  -    php_flag  track_vars        on  -    php_flag  track_vars        on
81  +    Require { (($cacti{'access'} ||"private") eq "public") ? "all granted" : "ip $localAccess $externalSSLAccess"; }  +    Require { (($cacti{'access'} ||"private") eq "public") ? "all granted" : "ip $localAccess $externalSSLAccess"; }
82  +    AddType application/x-httpd-php .php  +    AddType application/x-httpd-php .php
83  +    <FilesMatch \.php$\>  +    <FilesMatch \.php$ >
84  +      SetHandler "proxy:unix:/var/run/php-fpm/php74-cacti.sock|fcgi://localhost"  +      SetHandler "proxy:unix:/var/run/php-fpm/php74-cacti.sock|fcgi://localhost"
85  +    </FilesMatch>  +    </FilesMatch>
86   </Directory>   </Directory>

Legend:
Removed lines/characters  
Changed lines/characters
  Added lines/characters
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed