/[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.4 by jpp, Wed Jul 27 19:00:37 2022 UTC Revision 1.6 by jpp, Wed Jul 27 19:14:34 2022 UTC
# Line 1  Line 1 
 diff -Nur --no-dereference smeserver-cacti-1.1.19.old/createlinks smeserver-cacti-1.1.19/createlinks  
 --- smeserver-cacti-1.1.19.old/createlinks      2014-06-16 11:53:01.000000000 -0400  
 +++ smeserver-cacti-1.1.19/createlinks  2022-07-26 00:15:21.267000000 -0400  
 @@ -5,6 +5,7 @@  
  for my $event (qw(  
      post-upgrade  
      bootstrap-console-save  
 +    console-save  
         ))  
  {  
      templates2events("/etc/cacti/db.php", $event);  
 @@ -22,3 +23,26 @@  
  }  
   
  templates2events("/etc/e-smith/sql/init/80cacti", "post-upgrade");  
 +  
 +my $event="smeserver-cacti-update";  
 +event_templates($event, qw(  
 +  /etc/cacti/db.php  
 +  /etc/httpd/conf/httpd.conf  
 +  /etc/crontab  
 +  /etc/opt/remi/php74/php-fpm.d/www.conf  
 +  /etc/e-smith/sql/init/80cacti  
 +));  
 +  
 +event_services($event,  
 +  'crond' => 'restart',  
 +  'mysql.init' => 'restart',  
 +  'httpd-e-smith' => 'sigusr1',  
 +  'php74-php-fpm' => 'reload-or-restart'  
 +);  
 +  
 +#backup ?  
 +#use esmith::Build::Backup qw(:all);  
 +#backup_includes("smeserver-cacti", qw(  
 +#  
 +#));  
 +  
 diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/db/configuration/migrate/80cacti smeserver-cacti-1.1.19/root/etc/e-smith/db/configuration/migrate/80cacti  
 --- smeserver-cacti-1.1.19.old/root/etc/e-smith/db/configuration/migrate/80cacti        1969-12-31 19:00:00.000000000 -0500  
 +++ smeserver-cacti-1.1.19/root/etc/e-smith/db/configuration/migrate/80cacti    2022-07-26 00:51:52.311000000 -0400  
 @@ -0,0 +1,45 @@  
 +{  
 +    use MIME::Base64 qw(encode_base64);  
 +  
 +    my $service;  
 +    my $rec;  
 +    my $pw;  
 +  
 +    # Store the cacti password in the configuration database (if not already there)  
 +    $service = 'cacti';  
 +  
 +    $rec = $DB->get($service) || $DB->new_record($service, {type => 'service'});  
 +  
 +    $pw = $rec->prop('DbPassword');  
 +      
 +  
 +       if (! $pw)  
 +       {  
 +                
 +               if ( open( RANDOM, "/dev/urandom" ) )  
 +               {  
 +                       my $buf;  
 +                       # 57 bytes is a full line of Base64 coding, and contains  
 +                       # 456 bits of randomness - given a perfectly random /dev/random  
 +                       if ( read( RANDOM, $buf, 57 ) != 57 )  
 +                       {  
 +                           warn("Short read from /dev/random: $!");  
 +                       }  
 +                       else  
 +                       {  
 +                               $pw = encode_base64($buf);  
 +                           chomp $pw;  
 +                       }  
 +                       close RANDOM;  
 +               }  
 +               else  
 +               {  
 +                   warn "Could not open /dev/urandom: $!";  
 +               }  
 +                
 +               $rec->set_prop('DbPassword', $pw);  
 +       }  
 +  
 +  
 +  
 +}  
 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  
 --- 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  
 +++ smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/e-smith/sql/init/80cacti      2022-07-26 00:48:18.028000000 -0400  
 @@ -1,9 +1,9 @@  
  {  
 -    my $db = $cacti{DbName} || 'cacti_sme';  
 +    my $db = $cacti{DbDatabase} || 'cacti_sme';  
      my $user = $cacti{DbUser} || 'cacti';  
      my $pass = $cacti{DbPassword} || 'changeme';  
      $OUT .= <<END  
 -#! /bin/sh  
 +#!/bin/bash  
      if [ -d /var/lib/mysql/$db ]; then  
        exit  
      fi  
 @@ -13,10 +13,10 @@  
      use mysql;  
      GRANT ALL PRIVILEGES ON $db.* TO $user\@localhost  
              IDENTIFIED BY '$pass';  
 -    GRANT SELECT ON `mysql`.`time_zone_name` TO '$user'@'localhost';  
 +    GRANT SELECT ON mysql.time_zone_name TO '$user'@'localhost';  
      flush privileges;  
  EOF  
      /usr/bin/mysql_tzinfo_to_sql /usr/share/zoneinfo/ 2>/dev/null |/usr/bin/mysql mysql  
      /usr/bin/mysql $db < /etc/e-smith/db/configuration/migrate/80cacti_sme.sql  
  END  
 -}  
 \ Pas de fin de ligne à la fin du fichier  
 +}  
 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  
 --- 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/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti 2022-07-26 00:30:15.300000000 -0400  
 @@ -5,32 +5,19 @@  
      SSLRequireSSL  
      Options -Indexes  
      AllowOverride None  
 -    order deny,allow  
 -    deny from all  
 -  
 -{  
 -    my $cactiaxs = $cacti{'access'} || "private";  
 -    if ($cactiaxs eq "private")  
 -    {  
 -        $OUT .= "    allow from $localAccess $externalSSLAccess";  
 -    } else {  
 -       $OUT .= "    allow from all";  
 -    }  
 -}  
 -    Satisfy all  
 -    AddType application/x-httpd-php .php .php3  
 -    php_flag  magic_quotes_gpc  on  
 -    php_flag  track_vars        on  
 +    Require { (($cacti{'access'} ||"private") eq "public") ? "all granted" : "ip $localAccess $externalSSLAccess"; }  
 +    AddType application/x-httpd-php .php  
 +    <FilesMatch \.php$ >  
 +      SetHandler "proxy:unix:/var/run/php-fpm/php74-cacti.sock|fcgi://localhost"  
 +    </FilesMatch>  
  </Directory>  
   
   
   
  <Directory /usr/share/cacti/log>  
 -                Order deny,allow  
 -                Deny from all  
 +     Require all denied  
  </Directory>  
  <Directory /usr/share/cacti/rra>  
 -                Order deny,allow  
 -                Deny from all  
 +     Require all denied  
  </Directory>  
                                                           
1  diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti  diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti
2  --- smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti        1969-12-31 19:00:00.000000000 -0500  --- smeserver-cacti-1.1.19.old/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti        1969-12-31 19:00:00.000000000 -0500
3  +++ smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti    2022-07-26 00:03:45.335000000 -0400  +++ smeserver-cacti-1.1.19/root/etc/e-smith/templates/etc/php-fpm.d/www.conf/15cacti    2022-07-26 00:03:45.335000000 -0400
# Line 229  diff -Nur --no-dereference smeserver-cac Line 70  diff -Nur --no-dereference smeserver-cac
70  +  +
71  +  +
72  +  +
 diff -Nur --no-dereference smeserver-cacti-1.1.19.old/root/etc/e-smith/templates.metadata/etc/cacti/db.php smeserver-cacti-1.1.19/root/etc/e-smith/templates.metadata/etc/cacti/db.php  
 --- smeserver-cacti-1.1.19.old/root/etc/e-smith/templates.metadata/etc/cacti/db.php     2014-06-16 11:53:01.000000000 -0400  
 +++ smeserver-cacti-1.1.19/root/etc/e-smith/templates.metadata/etc/cacti/db.php 2022-07-26 00:44:20.988000000 -0400  
 @@ -1,3 +1,3 @@  
 -UID="cacti"  
 +UID="root"  
  GID="www"  
  PERMS=0640  
73  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
74  --- 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
75  +++ smeserver-cacti-1.1.19/createlinks  2022-07-27 14:55:50.939000000 -0400  +++ smeserver-cacti-1.1.19/createlinks  2022-07-27 14:55:50.939000000 -0400

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