/[smecontribs]/rpms/smeserver-zabbix-proxy/contribs7/smeserver-zabbix-proxy-0.1-server2proxy.patch
ViewVC logotype

Annotation of /rpms/smeserver-zabbix-proxy/contribs7/smeserver-zabbix-proxy-0.1-server2proxy.patch

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

Revision 1.1 - (hide annotations) (download)
Mon Mar 2 23:29:47 2009 UTC (15 years, 2 months ago) by slords
Branch: MAIN
CVS Tags: smeserver-zabbix-proxy-0_1-10_el4_sme, smeserver-zabbix-proxy-0_1-5_el4_sme, smeserver-zabbix-proxy-0_1-8_el4_sme, smeserver-zabbix-proxy-0_1-9_el4_sme, smeserver-zabbix-proxy-0_1-6_el4_sme, smeserver-zabbix-proxy-0_1-7_el4_sme, smeserver-zabbix-proxy-0_1-4_el4_sme, HEAD 
Initial import of smeserver-zabbix-proxy
1 slords 1.1 diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/createlinks mezzanine_patched_smeserver-zabbix-proxy-0.1/createlinks
2     --- smeserver-zabbix-proxy-0.1/createlinks 2009-02-27 14:22:44.000000000 +0100
3     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/createlinks 2009-02-27 13:53:01.000000000 +0100
4     @@ -2,30 +2,29 @@
5    
6     use esmith::Build::CreateLinks qw(:all);
7    
8     -my $event = 'zabbix-server-update';
9     +#my $event = 'zabbix-proxy-update';
10    
11     # Templates to expand
12     -templates2events("/etc/httpd/conf/httpd.conf", $event);
13     -templates2events("/etc/zabbix/zabbix_server.conf", qw(zabbix-server-update bootstrap-console-save));
14     -templates2events("/etc/zabbix/zabbix.conf.php", qw(zabbix-server-update bootstrap-console-save));
15     +templates2events("/etc/zabbix/zabbix_proxy.conf", qw(zabbix-proxy-update bootstrap-console-save));
16     +#templates2events("/etc/zabbix/zabbix.conf.php", qw(zabbix-server-update bootstrap-console-save));
17     templates2events("/etc/sudoers", $event);
18     -templates2events("/var/lib/zabbix/bin/sendxmpp", $event);
19     -templates2events("/etc/e-smith/sql/init/80zabbix-server", qw(zabbix-server-update bootstrap-console-save));
20     +#templates2events("/var/lib/zabbix/bin/sendxmpp", $event);
21     +templates2events("/etc/e-smith/sql/init/80zabbix-proxy", qw(zabbix-proxy-update bootstrap-console-save));
22    
23     # Services to restart
24     safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/mysql.init");
25     -safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
26     -safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zabbix-server");
27     +#safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith");
28     +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zabbix-proxy");
29    
30     # PHP header and footer
31     -safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/template-begin");
32     -safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/template-end");
33     +#safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/template-begin");
34     +#safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/template-end");
35    
36     # Bash header
37     -safe_symlink("/etc/e-smith/templates-default/template-begin-shell", "root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/template-begin");
38     +#safe_symlink("/etc/e-smith/templates-default/template-begin-shell", "root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/template-begin");
39    
40     # Start and stop links
41     -service_link_enhanced("zabbix-server", "S99", "7");
42     -service_link_enhanced("zabbix-server", "K10", "6");
43     -service_link_enhanced("zabbix-server", "K10", "0");
44     +service_link_enhanced("zabbix-proxy", "S99", "7");
45     +service_link_enhanced("zabbix-proxy", "K10", "6");
46     +service_link_enhanced("zabbix-proxy", "K10", "0");
47    
48     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/access mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/access
49     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/access 1970-01-01 01:00:00.000000000 +0100
50     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/access 2009-01-30 18:41:20.000000000 +0100
51     @@ -0,0 +1 @@
52     +private
53     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/DbName mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/DbName
54     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/DbName 1970-01-01 01:00:00.000000000 +0100
55     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/DbName 2009-02-27 14:00:14.000000000 +0100
56     @@ -0,0 +1 @@
57     +zabbixproxydb
58     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/DbUser mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/DbUser
59     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/DbUser 1970-01-01 01:00:00.000000000 +0100
60     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/DbUser 2009-01-30 18:45:12.000000000 +0100
61     @@ -0,0 +1 @@
62     +zabbixuser
63     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/status mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/status
64     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/status 1970-01-01 01:00:00.000000000 +0100
65     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/status 2009-01-30 18:40:16.000000000 +0100
66     @@ -0,0 +1 @@
67     +enabled
68     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/TCPPort mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/TCPPort
69     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/TCPPort 1970-01-01 01:00:00.000000000 +0100
70     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/TCPPort 2009-01-30 18:41:11.000000000 +0100
71     @@ -0,0 +1 @@
72     +10051
73     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/type mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/type
74     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/type 1970-01-01 01:00:00.000000000 +0100
75     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/type 2009-01-30 18:40:09.000000000 +0100
76     @@ -0,0 +1 @@
77     +service
78     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/access mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/access
79     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/access 2009-01-30 18:41:20.000000000 +0100
80     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/access 1970-01-01 01:00:00.000000000 +0100
81     @@ -1 +0,0 @@
82     -private
83     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/DbName mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/DbName
84     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/DbName 2009-01-30 18:45:01.000000000 +0100
85     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/DbName 1970-01-01 01:00:00.000000000 +0100
86     @@ -1 +0,0 @@
87     -zabbixdb
88     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/DbUser mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/DbUser
89     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/DbUser 2009-01-30 18:45:12.000000000 +0100
90     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/DbUser 1970-01-01 01:00:00.000000000 +0100
91     @@ -1 +0,0 @@
92     -zabbixuser
93     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberAccount mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberAccount
94     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberAccount 2009-02-02 23:21:31.000000000 +0100
95     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberAccount 1970-01-01 01:00:00.000000000 +0100
96     @@ -1 +0,0 @@
97     -zabbix
98     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberPassword mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberPassword
99     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberPassword 2009-02-02 23:21:52.000000000 +0100
100     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberPassword 1970-01-01 01:00:00.000000000 +0100
101     @@ -1 +0,0 @@
102     -secret
103     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberServer mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberServer
104     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberServer 2009-02-02 23:22:11.000000000 +0100
105     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberServer 1970-01-01 01:00:00.000000000 +0100
106     @@ -1 +0,0 @@
107     -localhost
108     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberTLS mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberTLS
109     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberTLS 2009-02-27 14:22:44.000000000 +0100
110     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberTLS 1970-01-01 01:00:00.000000000 +0100
111     @@ -1 +0,0 @@
112     -enabled
113     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/NodeID mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/NodeID
114     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/NodeID 2009-01-30 18:42:33.000000000 +0100
115     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/NodeID 1970-01-01 01:00:00.000000000 +0100
116     @@ -1 +0,0 @@
117     -0
118     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/status mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/status
119     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/status 2009-01-30 18:40:16.000000000 +0100
120     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/status 1970-01-01 01:00:00.000000000 +0100
121     @@ -1 +0,0 @@
122     -enabled
123     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/TCPPort mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/TCPPort
124     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/TCPPort 2009-01-30 18:41:11.000000000 +0100
125     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/TCPPort 1970-01-01 01:00:00.000000000 +0100
126     @@ -1 +0,0 @@
127     -10051
128     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/TimeZone mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/TimeZone
129     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/TimeZone 2009-02-04 09:05:11.000000000 +0100
130     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/TimeZone 1970-01-01 01:00:00.000000000 +0100
131     @@ -1 +0,0 @@
132     -Europe/Paris
133     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/type mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/type
134     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/type 2009-01-30 18:40:09.000000000 +0100
135     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/type 1970-01-01 01:00:00.000000000 +0100
136     @@ -1 +0,0 @@
137     -service
138     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/WebAccess mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/WebAccess
139     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/WebAccess 2009-01-30 18:40:28.000000000 +0100
140     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/WebAccess 1970-01-01 01:00:00.000000000 +0100
141     @@ -1 +0,0 @@
142     -local
143     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/migrate/zabbix-proxy-database mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/migrate/zabbix-proxy-database
144     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/migrate/zabbix-proxy-database 1970-01-01 01:00:00.000000000 +0100
145     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/migrate/zabbix-proxy-database 2009-02-27 14:01:05.000000000 +0100
146     @@ -0,0 +1,33 @@
147     +{
148     + my $rec = $DB->get('zabbix-proxy')
149     + || $DB->new_record('zabbix-proxy', {type => 'service'});
150     + my $pw = $rec->prop('DbPassword');
151     + if (not $pw or length($pw) < 57)
152     + {
153     + use MIME::Base64 qw(encode_base64);
154     +
155     + $pw = "not set due to error";
156     + if ( open( RANDOM, "/dev/urandom" ) )
157     + {
158     + my $buf;
159     + # 57 bytes is a full line of Base64 coding, and contains
160     + # 456 bits of randomness - given a perfectly random /dev/random
161     + if ( read( RANDOM, $buf, 57 ) != 57 )
162     + {
163     + warn("Short read from /dev/random: $!");
164     + }
165     + else
166     + {
167     + $pw = encode_base64($buf);
168     + chomp $pw;
169     + }
170     + close RANDOM;
171     + }
172     + else
173     + {
174     + warn "Could not open /dev/urandom: $!";
175     + }
176     + $rec->set_prop('DbPassword', $pw);
177     + }
178     +}
179     +
180     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/migrate/zabbix-server-database mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/migrate/zabbix-server-database
181     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/migrate/zabbix-server-database 2009-02-27 14:22:44.000000000 +0100
182     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/migrate/zabbix-server-database 1970-01-01 01:00:00.000000000 +0100
183     @@ -1,33 +0,0 @@
184     -{
185     - my $rec = $DB->get('zabbix-server')
186     - || $DB->new_record('zabbix-server', {type => 'service'});
187     - my $pw = $rec->prop('DbPassword');
188     - if (not $pw or length($pw) < 57)
189     - {
190     - use MIME::Base64 qw(encode_base64);
191     -
192     - $pw = "not set due to error";
193     - if ( open( RANDOM, "/dev/urandom" ) )
194     - {
195     - my $buf;
196     - # 57 bytes is a full line of Base64 coding, and contains
197     - # 456 bits of randomness - given a perfectly random /dev/random
198     - if ( read( RANDOM, $buf, 57 ) != 57 )
199     - {
200     - warn("Short read from /dev/random: $!");
201     - }
202     - else
203     - {
204     - $pw = encode_base64($buf);
205     - chomp $pw;
206     - }
207     - close RANDOM;
208     - }
209     - else
210     - {
211     - warn "Could not open /dev/urandom: $!";
212     - }
213     - $rec->set_prop('DbPassword', $pw);
214     - }
215     -}
216     -
217     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-proxy mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-proxy
218     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-proxy 1970-01-01 01:00:00.000000000 +0100
219     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-proxy 2009-02-27 14:07:17.000000000 +0100
220     @@ -0,0 +1,55 @@
221     +{
222     +my $db = ${'zabbix-proxy'}{'DbName'} || 'zabbix';
223     +my $user = ${'zabbix-proxy'}{'DbUser'} || 'zabbix';
224     +my $pass = ${'zabbix-proxy'}{'DbPassword'} || 'secret';
225     +
226     +my $dbpatch = `rpm -qd zabbix-server | grep dbpatch | grep mysql`;
227     +my $schema = `rpm -qd zabbix-server | grep schema | grep mysql`;
228     +my $data = `rpm -qd zabbix-server | grep data.sql`;
229     +my $images = `rpm -qd zabbix-server | grep images_mysql`;
230     +
231     +
232     +$OUT .= <<"END";
233     +#! /bin/sh
234     +if [ -d /var/lib/mysql/$db ]; then
235     + /usr/bin/mysql $db < $dbpatch
236     +else
237     + /usr/bin/mysqladmin create $db
238     + /usr/bin/mysql $db < $schema
239     + /usr/bin/mysql $db < $data
240     + /usr/bin/mysql $db < $images
241     +fi
242     +
243     +/usr/bin/mysql <<EOF
244     +USE mysql;
245     +
246     +REPLACE INTO user (
247     + host,
248     + user,
249     + password)
250     + VALUES (
251     + 'localhost',
252     + '${'zabbix-proxy'}{DbUser}',
253     + PASSWORD ('${'zabbix-proxy'}{DbPassword}'));
254     +
255     +
256     +REPLACE INTO db (
257     + host,
258     + db,
259     + user,
260     + select_priv, insert_priv, update_priv, delete_priv,
261     + create_priv, alter_priv, index_priv, drop_priv, create_tmp_table_priv,
262     + grant_priv, lock_tables_priv, references_priv)
263     + VALUES (
264     + 'localhost',
265     + '${'zabbix-proxy'}{DbName}',
266     + '${'zabbix-proxy'}{DbUser}',
267     + 'Y', 'Y', 'Y', 'Y',
268     + 'Y', 'Y', 'Y', 'Y', 'Y',
269     + 'N', 'Y', 'Y');
270     +
271     +FLUSH PRIVILEGES;
272     +
273     +EOF
274     +END
275     +}
276     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server
277     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server 2009-02-04 13:46:43.000000000 +0100
278     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/e-smith/sql/init/80zabbix-server 1970-01-01 01:00:00.000000000 +0100
279     @@ -1,79 +0,0 @@
280     -{
281     -my $db = ${'zabbix-server'}{'DbName'} || 'zabbix';
282     -my $user = ${'zabbix-server'}{'DbUser'} || 'zabbix';
283     -my $pass = ${'zabbix-server'}{'DbPassword'} || 'secret';
284     -
285     -my $dbpatch = `rpm -qd zabbix-server | grep dbpatch | grep mysql`;
286     -my $schema = `rpm -qd zabbix-server | grep schema | grep mysql`;
287     -my $data = `rpm -qd zabbix-server | grep data.sql`;
288     -my $images = `rpm -qd zabbix-server | grep images_mysql`;
289     -
290     -
291     -$OUT .= <<"END";
292     -#! /bin/sh
293     -if [ -d /var/lib/mysql/$db ]; then
294     - /usr/bin/mysql $db < $dbpatch
295     -else
296     - /usr/bin/mysqladmin create $db
297     - /usr/bin/mysql $db < $schema
298     - /usr/bin/mysql $db < $data
299     - /usr/bin/mysql $db < $images
300     -fi
301     -
302     -/usr/bin/mysql <<EOF
303     -USE mysql;
304     -
305     -REPLACE INTO user (
306     - host,
307     - user,
308     - password)
309     - VALUES (
310     - 'localhost',
311     - '${'zabbix-server'}{DbUser}',
312     - PASSWORD ('${'zabbix-server'}{DbPassword}'));
313     -
314     -
315     -REPLACE INTO db (
316     - host,
317     - db,
318     - user,
319     - select_priv, insert_priv, update_priv, delete_priv,
320     - create_priv, alter_priv, index_priv, drop_priv, create_tmp_table_priv,
321     - grant_priv, lock_tables_priv, references_priv)
322     - VALUES (
323     - 'localhost',
324     - '${'zabbix-server'}{DbName}',
325     - '${'zabbix-server'}{DbUser}',
326     - 'Y', 'Y', 'Y', 'Y',
327     - 'Y', 'Y', 'Y', 'Y', 'Y',
328     - 'N', 'Y', 'Y');
329     -
330     -FLUSH PRIVILEGES;
331     -
332     -USE ${'zabbix-server'}{DbName};
333     -
334     -INSERT IGNORE INTO media_type (
335     - mediatypeid,
336     - type, description,
337     - smtp_server,
338     - smtp_helo,
339     - smtp_email,
340     - exec_path,
341     - gsm_modem,
342     - username,
343     - passwd)
344     - VALUES(
345     - 4,
346     - 1,
347     - 'xmpp',
348     - '',
349     - '',
350     - '',
351     - 'sendxmpp',
352     - '',
353     - '',
354     - '');
355     -
356     -EOF
357     -END
358     -}
359     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web
360     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web 2009-02-27 14:22:44.000000000 +0100
361     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/98zabbix-web 1970-01-01 01:00:00.000000000 +0100
362     @@ -1,50 +0,0 @@
363     -{
364     -if (
365     - ((${'zabbix-server'}{'status'} || 'disabled') eq 'enabled') &&
366     - ((${'zabbix-server'}{'WebAccess'} || 'local') ne 'disabled')){
367     -
368     -my $access = (${'zabbix-server'}{'WebAccess'} || 'local') eq 'public' ?
369     - 'all':"$localAccess $externalSSLAccess";
370     -
371     -my $tz = ${'zabbix-server'}{'TimeZone'} || 'Europe/Paris';
372     -
373     -$OUT .=<<"HERE";
374     -#-------------------------------------------#
375     -# Zabbix monitoring system php web frontend #
376     -#-------------------------------------------#
377     -
378     -Alias /zabbix /usr/share/zabbix
379     -
380     -<Directory "/usr/share/zabbix">
381     - SSLRequireSSL on
382     - Options FollowSymLinks
383     - AddType application/x-httpd-php .php
384     - php_admin_value max_execution_time 350
385     - php_admin_value memory_limit 50M
386     - php_admin_value date.timezone $tz
387     - AllowOverride None
388     - Order allow,deny
389     - Allow from $access
390     -</Directory>
391     -
392     -<Directory "/usr/share/zabbix/include">
393     - Order deny,allow
394     - Deny from all
395     - <files *.php>
396     - Order deny,allow
397     - Deny from all
398     - </files>
399     -</Directory>
400     -
401     -<Directory "/usr/share/zabbix/include/classes">
402     - Order deny,allow
403     - Deny from all
404     - <files *.php>
405     - Order deny,allow
406     - Deny from all
407     - </files>
408     -</Directory>
409     -
410     -HERE
411     -}
412     -}
413     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60ZabbixSSL mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60ZabbixSSL
414     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60ZabbixSSL 2009-02-04 12:16:56.000000000 +0100
415     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/VirtualHosts/60ZabbixSSL 1970-01-01 01:00:00.000000000 +0100
416     @@ -1,7 +0,0 @@
417     -{
418     -
419     - if ($port ne ${modSSL}{'TCPPort'}){
420     - $OUT = ' RewriteRule ^/zabbix(/.*|$) https://%{HTTP_HOST}/zabbix$1 [L,R]';
421     - }
422     -}
423     -
424     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/00header mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/00header
425     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/00header 2009-02-02 22:37:27.000000000 +0100
426     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/00header 1970-01-01 01:00:00.000000000 +0100
427     @@ -1,19 +0,0 @@
428     -/*
429     -** ZABBIX
430     -** Copyright (C) 2000-2005 SIA Zabbix
431     -**
432     -** This program is free software; you can redistribute it and/or modify
433     -** it under the terms of the GNU General Public License as published by
434     -** the Free Software Foundation; either version 2 of the License, or
435     -** (at your option) any later version.
436     -**
437     -** This program is distributed in the hope that it will be useful,
438     -** but WITHOUT ANY WARRANTY; without even the implied warranty of
439     -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
440     -** GNU General Public License for more details.
441     -**
442     -** You should have received a copy of the GNU General Public License
443     -** along with this program; if not, write to the Free Software
444     -** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
445     -**/
446     -
447     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/10database mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/10database
448     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/10database 2009-02-03 04:01:01.000000000 +0100
449     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/10database 1970-01-01 01:00:00.000000000 +0100
450     @@ -1,20 +0,0 @@
451     -global $DB;
452     -
453     -$DB["TYPE"] = "MYSQL";
454     -$DB["SERVER"] = "localhost";
455     -$DB["PORT"] = "0";
456     -
457     -{
458     -
459     -my $dbname = ${'zabbix-server'}{'DbName'} || 'zabbix';
460     -my $dbuser = ${'zabbix-server'}{'DbUser'} || 'zabbix';
461     -my $dbpass = ${'zabbix-server'}{'DbPassword'} || 'secret';
462     -
463     -$OUT .=<<"HERE";
464     -
465     -\$DB["DATABASE"] = "$dbname";
466     -\$DB["USER"] = "$dbuser";
467     -\$DB["PASSWORD"] = "$dbpass";
468     -HERE
469     -}
470     -
471     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/20zbxserver mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/20zbxserver
472     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/20zbxserver 2009-02-02 22:44:33.000000000 +0100
473     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/20zbxserver 1970-01-01 01:00:00.000000000 +0100
474     @@ -1,10 +0,0 @@
475     -{
476     -my $port = ${'zabbix-server'}{'TCPPort'} || '10051';
477     -
478     -$OUT .=<<"HERE";
479     -
480     -\$ZBX_SERVER = "localhost";
481     -\$ZBX_SERVER_PORT = "$port";
482     -HERE
483     -}
484     -
485     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/30images mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/30images
486     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/30images 2009-02-02 22:46:18.000000000 +0100
487     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/30images 1970-01-01 01:00:00.000000000 +0100
488     @@ -1 +0,0 @@
489     -$IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG;
490     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/00header mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/00header
491     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/00header 1970-01-01 01:00:00.000000000 +0100
492     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/00header 2009-02-27 14:12:04.000000000 +0100
493     @@ -0,0 +1,4 @@
494     +# This is config file for ZABBIX server process
495     +# To get more information about ZABBIX,
496     +# go http://www.zabbix.com
497     +
498     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/10zabbixServers mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/10zabbixServers
499     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/10zabbixServers 1970-01-01 01:00:00.000000000 +0100
500     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/10zabbixServers 2009-02-27 14:14:47.000000000 +0100
501     @@ -0,0 +1,10 @@
502     +############ GENERAL PARAMETERS #################
503     +
504     +# IP address (or hostname) of ZABBIX servers.
505     +
506     +Server={ (${'zabbix-proxy'}{'Servers'} || '127.0.0.1'); }
507     +
508     +# Server port for sending active checks
509     +
510     +ServerPort={ (${'zabbix-proxy'}{'ServerPort'} || '10051'); }
511     +
512     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/15hostname mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/15hostname
513     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/15hostname 1970-01-01 01:00:00.000000000 +0100
514     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/15hostname 2009-02-27 14:15:26.000000000 +0100
515     @@ -0,0 +1,4 @@
516     +
517     +# Unique hostname.
518     +
519     +Hostname={$SystemName.".".$DomainName;}
520     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/20instances mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/20instances
521     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/20instances 1970-01-01 01:00:00.000000000 +0100
522     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/20instances 2009-02-02 20:02:23.000000000 +0100
523     @@ -0,0 +1,35 @@
524     +# Number of pre-forked instances of pollers
525     +# Default value is 5
526     +# This parameter must be between 0 and 255
527     +StartPollers=5
528     +
529     +# Number of pre-forked instances of IPMI pollers
530     +# Default value is 0
531     +# This parameter must be between 0 and 255
532     +#StartIPMIPollers=0
533     +
534     +# Number of pre-forked instances of pollers for unreachable hosts
535     +# Default value is 1
536     +# This parameter must be between 0 and 255
537     +#StartPollersUnreachable=1
538     +
539     +# Number of pre-forked instances of trappers
540     +# Default value is 5
541     +# This parameter must be between 0 and 255
542     +StartTrappers=5
543     +
544     +# Number of pre-forked instances of ICMP pingers
545     +# Default value is 1
546     +# This parameter must be between 0 and 255
547     +StartPingers=1
548     +
549     +# Number of pre-forked instances of discoverers
550     +# Default value is 1
551     +# This parameter must be between 0 and 255
552     +StartDiscoverers=1
553     +
554     +# Number of pre-forked instances of HTTP pollers
555     +# Default value is 1
556     +# This parameter must be between 0 and 255
557     +#StartHTTPPollers=1
558     +
559     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/30listen mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/30listen
560     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/30listen 1970-01-01 01:00:00.000000000 +0100
561     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/30listen 2009-02-27 14:17:00.000000000 +0100
562     @@ -0,0 +1,16 @@
563     +# Listen port for trapper. Default port number is 10051. This parameter
564     +# must be between 1024 and 32767
565     +{
566     +my $port = ${'zabbix-proxy'}{'TCPPort'} || '10051';
567     +$OUT .= "ListenPort=$port\n";
568     +}
569     +
570     +# Source IP address for outgouing connections
571     +#SourceIP=
572     +
573     +# Listen interface for trapper. Trapper will listen all network interfaces
574     +# if this parameter is missing.
575     +
576     +#ListenIP=127.0.0.1
577     +
578     +
579     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/40freq mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/40freq
580     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/40freq 1970-01-01 01:00:00.000000000 +0100
581     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/40freq 2009-02-27 14:18:02.000000000 +0100
582     @@ -0,0 +1,34 @@
583     +# How often ZABBIX will perform sending hearbeat message
584     +# (in seconds)
585     +# Default value is 60 seconds
586     +# Set to 0 to disable heartbeat messages
587     +# This parameter must be between 0 and 3600
588     +#HeartbeatFrequency=60
589     +
590     +# How often ZABBIX will perform sync configuration data
591     +# (in seconds)
592     +# Default value is 3600 seconds (1h)
593     +# This parameter must be between 1 and 604800 (1 week)
594     +#ConfigFrequency=3600
595     +
596     +
597     +# How often ZABBIX will perform housekeeping procedure
598     +# (in hours)
599     +# Default value is 1 hour
600     +# Housekeeping is removing unnecessary information from
601     +# tables history, alert, and alarms
602     +# This parameter must be between 1 and 24
603     +
604     +#HousekeepingFrequency=1
605     +
606     +# How often ZABBIX will try to send unsent alerts
607     +# (in seconds)
608     +# Default value is 30 seconds
609     +SenderFrequency=30
610     +
611     +# Uncomment this line to disable housekeeping procedure
612     +#DisableHousekeeping=1
613     +
614     +# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
615     +#PingerFrequency=60
616     +
617     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/45proxybuffers mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/45proxybuffers
618     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/45proxybuffers 1970-01-01 01:00:00.000000000 +0100
619     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/45proxybuffers 2009-02-27 14:19:02.000000000 +0100
620     @@ -0,0 +1,9 @@
621     +# Local bufer size in hours. Proxy will keep collected data N hours.
622     +# Default value is 0 hours
623     +#ProxyLocalBuffer=0
624     +
625     +# Offline buffer size in hours. It is used when server is not available.
626     +# Older data is removed.
627     +# Default value is 1 hours
628     +ProxyOfflineBuffer=24
629     +
630     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/50debug mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/50debug
631     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/50debug 1970-01-01 01:00:00.000000000 +0100
632     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/50debug 2009-02-02 20:24:38.000000000 +0100
633     @@ -0,0 +1,9 @@
634     +# Specifies debug level
635     +# 0 - debug is not created
636     +# 1 - critical information
637     +# 2 - error information
638     +# 3 - warnings (default)
639     +# 4 - for debugging (produces lots of information)
640     +
641     +DebugLevel=3
642     +
643     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/55timeout mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/55timeout
644     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/55timeout 1970-01-01 01:00:00.000000000 +0100
645     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/55timeout 2009-02-27 14:20:11.000000000 +0100
646     @@ -0,0 +1,17 @@
647     +# Specifies how long we wait for agent response (in sec)
648     +# Must be between 1 and 30
649     +Timeout=5
650     +
651     +# Specifies how many seconds trapper may spend processing new data
652     +# Must be between 1 and 30
653     +#TrapperTimeout=5
654     +
655     +# After how many seconds of unreachability treat a host as unavailable
656     +#UnreachablePeriod=45
657     +
658     +# How ofter check host for availability during the unreachability period
659     +#UnavailableDelay=15
660     +
661     +# How ofter check host for availability during the unavailability period
662     +#UnavailableDelay=60
663     +
664     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/60pidAndLog mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/60pidAndLog
665     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/60pidAndLog 1970-01-01 01:00:00.000000000 +0100
666     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/60pidAndLog 2009-02-27 14:20:55.000000000 +0100
667     @@ -0,0 +1,13 @@
668     +# Name of PID file
669     +
670     +PidFile=/var/run/zabbix/zabbix_proxy.pid
671     +
672     +# Name of log file
673     +# If not set, syslog is used
674     +
675     +LogFile=/var/log/zabbix/zabbix_proxy.log
676     +
677     +# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
678     +LogFileSize=10
679     +
680     +
681     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/70location mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/70location
682     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/70location 1970-01-01 01:00:00.000000000 +0100
683     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/70location 2009-02-27 14:21:20.000000000 +0100
684     @@ -0,0 +1,17 @@
685     +# Location for custom alert scripts
686     +AlertScriptsPath=/var/lib/zabbix/bin
687     +
688     +# Location of external scripts
689     +ExternalScripts=/var/lib/zabbix/bin
690     +
691     +# Location of fping. Default is /usr/sbin/fping
692     +# Make sure that fping binary has root permissions and SUID flag set
693     +FpingLocation=/var/lib/zabbix/bin/fping
694     +
695     +# Location of fping6. Default is /usr/sbin/fping6
696     +# Make sure that fping binary has root permissions and SUID flag set
697     +Fping6Location=/var/lib/zabbix/bin/fping6
698     +
699     +# Temporary directory. Default is /tmp
700     +TmpDir=/var/lib/zabbix/tmp
701     +
702     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/80database mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/80database
703     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/80database 1970-01-01 01:00:00.000000000 +0100
704     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/80database 2009-02-27 14:21:42.000000000 +0100
705     @@ -0,0 +1,32 @@
706     +# Database host name
707     +# Default is localhost
708     +
709     +DBHost=localhost
710     +
711     +# Database name
712     +# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored.
713     +{
714     +my $dbname = ${'zabbix-proxy'}{'DbName'} || 'zabbix';
715     +my $dbuser = ${'zabbix-proxy'}{'DbUser'} || 'zabbix';
716     +my $dbpass = ${'zabbix-proxy'}{'DbPassword'} || 'secret';
717     +
718     +$OUT .=<<"HERE";
719     +
720     +DBName=$dbname
721     +
722     +# Database user
723     +
724     +DBUser=$dbuser
725     +
726     +# Database password
727     +# Comment this line if no password used
728     +
729     +DBPassword=$dbpass
730     +HERE
731     +
732     +}
733     +
734     +# Connect to MySQL using Unix socket?
735     +
736     +DBSocket=/var/lib/mysql/mysql.sock
737     +
738     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/00header mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/00header
739     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/00header 2009-02-02 19:58:13.000000000 +0100
740     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/00header 1970-01-01 01:00:00.000000000 +0100
741     @@ -1,4 +0,0 @@
742     -# This is config file for ZABBIX server process
743     -# To get more information about ZABBIX,
744     -# go http://www.zabbix.com
745     -
746     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/10NodeID mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/10NodeID
747     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/10NodeID 2009-02-03 03:55:05.000000000 +0100
748     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/10NodeID 1970-01-01 01:00:00.000000000 +0100
749     @@ -1,11 +0,0 @@
750     -############ GENERAL PARAMETERS #################
751     -
752     -# This defines unique NodeID in distributed setup,
753     -# Default value 0 (standalone server)
754     -# This parameter must be between 0 and 999
755     -
756     -{
757     -my $nodeID = ${'zabbix-server'}{'NodeID'} || '0';
758     -$OUT .= "NodeID=$nodeID\n";
759     -}
760     -
761     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/20instances mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/20instances
762     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/20instances 2009-02-02 20:02:23.000000000 +0100
763     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/20instances 1970-01-01 01:00:00.000000000 +0100
764     @@ -1,35 +0,0 @@
765     -# Number of pre-forked instances of pollers
766     -# Default value is 5
767     -# This parameter must be between 0 and 255
768     -StartPollers=5
769     -
770     -# Number of pre-forked instances of IPMI pollers
771     -# Default value is 0
772     -# This parameter must be between 0 and 255
773     -#StartIPMIPollers=0
774     -
775     -# Number of pre-forked instances of pollers for unreachable hosts
776     -# Default value is 1
777     -# This parameter must be between 0 and 255
778     -#StartPollersUnreachable=1
779     -
780     -# Number of pre-forked instances of trappers
781     -# Default value is 5
782     -# This parameter must be between 0 and 255
783     -StartTrappers=5
784     -
785     -# Number of pre-forked instances of ICMP pingers
786     -# Default value is 1
787     -# This parameter must be between 0 and 255
788     -StartPingers=1
789     -
790     -# Number of pre-forked instances of discoverers
791     -# Default value is 1
792     -# This parameter must be between 0 and 255
793     -StartDiscoverers=1
794     -
795     -# Number of pre-forked instances of HTTP pollers
796     -# Default value is 1
797     -# This parameter must be between 0 and 255
798     -#StartHTTPPollers=1
799     -
800     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/30listen mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/30listen
801     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/30listen 2009-02-02 20:22:12.000000000 +0100
802     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/30listen 1970-01-01 01:00:00.000000000 +0100
803     @@ -1,16 +0,0 @@
804     -# Listen port for trapper. Default port number is 10051. This parameter
805     -# must be between 1024 and 32767
806     -{
807     -my $port = ${'zabbix-server'}{'TCPPort'} || '10051';
808     -$OUT .= "ListenPort=$port\n";
809     -}
810     -
811     -# Source IP address for outgouing connections
812     -#SourceIP=
813     -
814     -# Listen interface for trapper. Trapper will listen all network interfaces
815     -# if this parameter is missing.
816     -
817     -#ListenIP=127.0.0.1
818     -
819     -
820     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/40freq mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/40freq
821     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/40freq 2009-02-02 20:31:15.000000000 +0100
822     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/40freq 1970-01-01 01:00:00.000000000 +0100
823     @@ -1,20 +0,0 @@
824     -# How often ZABBIX will perform housekeeping procedure
825     -# (in hours)
826     -# Default value is 1 hour
827     -# Housekeeping is removing unnecessary information from
828     -# tables history, alert, and alarms
829     -# This parameter must be between 1 and 24
830     -
831     -#HousekeepingFrequency=1
832     -
833     -# How often ZABBIX will try to send unsent alerts
834     -# (in seconds)
835     -# Default value is 30 seconds
836     -SenderFrequency=30
837     -
838     -# Uncomment this line to disable housekeeping procedure
839     -#DisableHousekeeping=1
840     -
841     -# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds.
842     -#PingerFrequency=60
843     -
844     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/50debug mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/50debug
845     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/50debug 2009-02-02 20:24:38.000000000 +0100
846     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/50debug 1970-01-01 01:00:00.000000000 +0100
847     @@ -1,9 +0,0 @@
848     -# Specifies debug level
849     -# 0 - debug is not created
850     -# 1 - critical information
851     -# 2 - error information
852     -# 3 - warnings (default)
853     -# 4 - for debugging (produces lots of information)
854     -
855     -DebugLevel=3
856     -
857     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/60pidAndLog mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/60pidAndLog
858     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/60pidAndLog 2009-02-02 20:27:18.000000000 +0100
859     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/60pidAndLog 1970-01-01 01:00:00.000000000 +0100
860     @@ -1,13 +0,0 @@
861     -# Name of PID file
862     -
863     -PidFile=/var/run/zabbix/zabbix.pid
864     -
865     -# Name of log file
866     -# If not set, syslog is used
867     -
868     -LogFile=/var/log/zabbix/zabbix_server.log
869     -
870     -# Maximum size of log file in MB. Set to 0 to disable automatic log rotation.
871     -LogFileSize=10
872     -
873     -
874     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/70location mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/70location
875     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/70location 2009-02-27 14:22:44.000000000 +0100
876     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/70location 1970-01-01 01:00:00.000000000 +0100
877     @@ -1,17 +0,0 @@
878     -# Location for custom alert scripts
879     -AlertScriptsPath=/var/lib/zabbix/bin
880     -
881     -# Location of external scripts
882     -ExternalScripts=/var/lib/zabbix/bin
883     -
884     -# Location of fping. Default is /usr/sbin/fping
885     -# Make sure that fping binary has root permissions and SUID flag set
886     -FpingLocation=/var/lib/zabbix/bin/fping
887     -
888     -# Location of fping6. Default is /usr/sbin/fping6
889     -# Make sure that fping binary has root permissions and SUID flag set
890     -Fping6Location=/var/lib/zabbix/bin/fping6
891     -
892     -# Temporary directory. Default is /tmp
893     -TmpDir=/var/lib/zabbix/tmp
894     -
895     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/80database mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/80database
896     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/80database 2009-02-02 20:36:29.000000000 +0100
897     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/80database 1970-01-01 01:00:00.000000000 +0100
898     @@ -1,32 +0,0 @@
899     -# Database host name
900     -# Default is localhost
901     -
902     -DBHost=localhost
903     -
904     -# Database name
905     -# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored.
906     -{
907     -my $dbname = ${'zabbix-server'}{'DbName'} || 'zabbix';
908     -my $dbuser = ${'zabbix-server'}{'DbUser'} || 'zabbix';
909     -my $dbpass = ${'zabbix-server'}{'DbPassword'} || 'secret';
910     -
911     -$OUT .=<<"HERE";
912     -
913     -DBName=$dbname
914     -
915     -# Database user
916     -
917     -DBUser=$dbuser
918     -
919     -# Database password
920     -# Comment this line if no password used
921     -
922     -DBPassword=$dbpass
923     -HERE
924     -
925     -}
926     -
927     -# Connect to MySQL using Unix socket?
928     -
929     -DBSocket=/var/lib/mysql/mysql.sock
930     -
931     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all
932     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all 2009-02-27 14:22:44.000000000 +0100
933     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all 1970-01-01 01:00:00.000000000 +0100
934     @@ -1,9 +0,0 @@
935     -
936     -echo "$3" | \
937     - sendxmpp -u {${'zabbix-server'}{'JabberAccount'};} \
938     - -p {${'zabbix-server'}{'JabberPassword'};} \
939     - -j {${'zabbix-server'}{'JabberServer'};} \
940     - -r zabbix \
941     - {(${'zabbix-server'}{'JabberTLS'} || 'enabled') eq 'disabled' ? '':'-t \\';}
942     - -s "$2" "$1"
943     -
944     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-proxy mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-proxy
945     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-proxy 1970-01-01 01:00:00.000000000 +0100
946     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-proxy 2009-02-02 23:40:29.000000000 +0100
947     @@ -0,0 +1 @@
948     +PERMS=0750
949     diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-server mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-server
950     --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-server 2009-02-02 23:40:29.000000000 +0100
951     +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates.metadata/etc/e-smith/sql/init/80zabbix-server 1970-01-01 01:00:00.000000000 +0100
952     @@ -1 +0,0 @@
953     -PERMS=0750
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed