/[smecontribs]/rpms/smeserver-cacti/contribs8/smeserver-cacti-0.8.8b-patch0.patch
ViewVC logotype

Contents of /rpms/smeserver-cacti/contribs8/smeserver-cacti-0.8.8b-patch0.patch

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


Revision 1.2 - (show annotations) (download)
Tue Jun 17 18:35:32 2014 UTC (10 years, 4 months ago) by unnilennium
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
Error occurred while calculating annotation data.
FILE REMOVED
Initial import to v9

1 diff -up smeserver-cacti-0.8.8b/root/etc/e-smith/db/configuration/defaults/cacti/type.patch0 smeserver-cacti-0.8.8b/root/etc/e-smith/db/configuration/defaults/cacti/type
2 --- smeserver-cacti-0.8.8b/root/etc/e-smith/db/configuration/defaults/cacti/type.patch0 2013-10-18 14:52:39.000000000 -0400
3 +++ smeserver-cacti-0.8.8b/root/etc/e-smith/db/configuration/defaults/cacti/type 2013-10-18 14:52:46.000000000 -0400
4 @@ -0,0 +1 @@
5 +service
6 diff -up smeserver-cacti-0.8.8b/root/etc/e-smith/db/configuration/migrate/80cacti.patch0 smeserver-cacti-0.8.8b/root/etc/e-smith/db/configuration/migrate/80cacti
7 --- smeserver-cacti-0.8.8b/root/etc/e-smith/db/configuration/migrate/80cacti.patch0 2013-10-15 22:57:33.000000000 -0400
8 +++ smeserver-cacti-0.8.8b/root/etc/e-smith/db/configuration/migrate/80cacti 2013-10-18 14:55:00.000000000 -0400
9 @@ -17,12 +17,10 @@
10 $rec = $DB->get($service) || $DB->new_record($service, {type => 'service'});
11
12 $pw = $rec->prop('DbPassword');
13 - return "" if $pw;
14
15
16 if (! $pw)
17 {
18 - system("mysql cacti_sme < /etc/e-smith/db/configuration/migrate/80cacti_sme.sql");
19
20 if ( open( RANDOM, "/dev/urandom" ) )
21 {
22 diff -up smeserver-cacti-0.8.8b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti.patch0 smeserver-cacti-0.8.8b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti
23 --- smeserver-cacti-0.8.8b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti.patch0 2013-10-14 18:14:46.000000000 -0400
24 +++ smeserver-cacti-0.8.8b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/86Cacti 2013-10-18 15:00:17.000000000 -0400
25 @@ -1,7 +1,8 @@
26
27 # Cacti template
28 +Alias /cacti /usr/share/cacti
29 <Directory /usr/share/cacti>
30 - SSLRequireSSL on
31 + SSLRequireSSL
32 Options -Indexes
33 AllowOverride None
34 order deny,allow
35 @@ -16,10 +17,20 @@
36 $OUT .= " allow from all";
37 }
38 }
39 - allow from all
40 Satisfy all
41 AddType application/x-httpd-php .php .php3
42 php_flag magic_quotes_gpc on
43 php_flag track_vars on
44 </Directory>
45 -
46 \ Pas de fin de ligne à la fin du fichier.
47 +
48 +
49 +
50 +<Directory /usr/share/cacti/log>
51 + Order deny,allow
52 + Deny from all
53 +</Directory>
54 +<Directory /usr/share/cacti/rra>
55 + Order deny,allow
56 + Deny from all
57 +</Directory>
58 +
59
60 diff -up smeserver-cacti-0.8.8b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30Cacti.patch0 smeserver-cacti-0.8.8b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30Cacti
61 --- smeserver-cacti-0.8.8b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30Cacti.patch0 2007-11-26 23:01:23.000000000 -0500
62 +++ smeserver-cacti-0.8.8b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/30Cacti 2013-10-18 15:01:15.000000000 -0400
63 @@ -4,6 +4,6 @@
64 {
65 $OUT = ' RewriteRule ^/cacti(/.*|$) https://%{HTTP_HOST}/cacti$1 [L,R]';
66 } else {
67 - $OUT = ' Alias /cacti /opt/cacti';
68 + $OUT = ' Alias /cacti /usr/share/cacti';
69 }
70 }

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed