diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-proxy-0.1/createlinks mezzanine_patched_smeserver-zabbix-proxy-0.1/createlinks --- smeserver-zabbix-proxy-0.1/createlinks 2009-02-27 14:22:44.000000000 +0100 +++ mezzanine_patched_smeserver-zabbix-proxy-0.1/createlinks 2009-02-27 13:53:01.000000000 +0100 @@ -2,30 +2,29 @@ use esmith::Build::CreateLinks qw(:all); -my $event = 'zabbix-server-update'; +#my $event = 'zabbix-proxy-update'; # Templates to expand -templates2events("/etc/httpd/conf/httpd.conf", $event); -templates2events("/etc/zabbix/zabbix_server.conf", qw(zabbix-server-update bootstrap-console-save)); -templates2events("/etc/zabbix/zabbix.conf.php", qw(zabbix-server-update bootstrap-console-save)); +templates2events("/etc/zabbix/zabbix_proxy.conf", qw(zabbix-proxy-update bootstrap-console-save)); +#templates2events("/etc/zabbix/zabbix.conf.php", qw(zabbix-server-update bootstrap-console-save)); templates2events("/etc/sudoers", $event); -templates2events("/var/lib/zabbix/bin/sendxmpp", $event); -templates2events("/etc/e-smith/sql/init/80zabbix-server", qw(zabbix-server-update bootstrap-console-save)); +#templates2events("/var/lib/zabbix/bin/sendxmpp", $event); +templates2events("/etc/e-smith/sql/init/80zabbix-proxy", qw(zabbix-proxy-update bootstrap-console-save)); # Services to restart safe_symlink("restart", "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/zabbix-server"); +#safe_symlink("sigusr1", "root/etc/e-smith/events/$event/services2adjust/httpd-e-smith"); +safe_symlink("restart", "root/etc/e-smith/events/$event/services2adjust/zabbix-proxy"); # PHP header and footer -safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/template-begin"); -safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/template-end"); +#safe_symlink("/etc/e-smith/templates-default/template-begin-php", "root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/template-begin"); +#safe_symlink("/etc/e-smith/templates-default/template-end-php", "root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/template-end"); # Bash header -safe_symlink("/etc/e-smith/templates-default/template-begin-shell", "root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/template-begin"); +#safe_symlink("/etc/e-smith/templates-default/template-begin-shell", "root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/template-begin"); # Start and stop links -service_link_enhanced("zabbix-server", "S99", "7"); -service_link_enhanced("zabbix-server", "K10", "6"); -service_link_enhanced("zabbix-server", "K10", "0"); +service_link_enhanced("zabbix-proxy", "S99", "7"); +service_link_enhanced("zabbix-proxy", "K10", "6"); +service_link_enhanced("zabbix-proxy", "K10", "0"); 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/access 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1 @@ +private 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/DbName 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1 @@ +zabbixproxydb 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/DbUser 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1 @@ +zabbixuser 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/status 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1 @@ +enabled 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/TCPPort 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1 @@ +10051 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-proxy/type 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1 @@ +service 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/access 2009-01-30 18:41:20.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -private 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/DbName 2009-01-30 18:45:01.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -zabbixdb 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/DbUser 2009-01-30 18:45:12.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -zabbixuser 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberAccount 2009-02-02 23:21:31.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -zabbix 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberPassword 2009-02-02 23:21:52.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -secret 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberServer 2009-02-02 23:22:11.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -localhost 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/JabberTLS 2009-02-27 14:22:44.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -enabled 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/NodeID 2009-01-30 18:42:33.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -0 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/status 2009-01-30 18:40:16.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -enabled 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/TCPPort 2009-01-30 18:41:11.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -10051 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/TimeZone 2009-02-04 09:05:11.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -Europe/Paris 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/type 2009-01-30 18:40:09.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -service 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/defaults/zabbix-server/WebAccess 2009-01-30 18:40:28.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -local 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/migrate/zabbix-proxy-database 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,33 @@ +{ + my $rec = $DB->get('zabbix-proxy') + || $DB->new_record('zabbix-proxy', {type => 'service'}); + my $pw = $rec->prop('DbPassword'); + if (not $pw or length($pw) < 57) + { + use MIME::Base64 qw(encode_base64); + + $pw = "not set due to error"; + 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 -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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/db/configuration/migrate/zabbix-server-database 2009-02-27 14:22:44.000000000 +0100 +++ 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 @@ -1,33 +0,0 @@ -{ - my $rec = $DB->get('zabbix-server') - || $DB->new_record('zabbix-server', {type => 'service'}); - my $pw = $rec->prop('DbPassword'); - if (not $pw or length($pw) < 57) - { - use MIME::Base64 qw(encode_base64); - - $pw = "not set due to error"; - 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 -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 --- 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 +++ 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 @@ -0,0 +1,55 @@ +{ +my $db = ${'zabbix-proxy'}{'DbName'} || 'zabbix'; +my $user = ${'zabbix-proxy'}{'DbUser'} || 'zabbix'; +my $pass = ${'zabbix-proxy'}{'DbPassword'} || 'secret'; + +my $dbpatch = `rpm -qd zabbix-server | grep dbpatch | grep mysql`; +my $schema = `rpm -qd zabbix-server | grep schema | grep mysql`; +my $data = `rpm -qd zabbix-server | grep data.sql`; +my $images = `rpm -qd zabbix-server | grep images_mysql`; + + +$OUT .= <<"END"; +#! /bin/sh +if [ -d /var/lib/mysql/$db ]; then + /usr/bin/mysql $db < $dbpatch +else + /usr/bin/mysqladmin create $db + /usr/bin/mysql $db < $schema + /usr/bin/mysql $db < $data + /usr/bin/mysql $db < $images +fi + +/usr/bin/mysql < - SSLRequireSSL on - Options FollowSymLinks - AddType application/x-httpd-php .php - php_admin_value max_execution_time 350 - php_admin_value memory_limit 50M - php_admin_value date.timezone $tz - AllowOverride None - Order allow,deny - Allow from $access - - - - Order deny,allow - Deny from all - - Order deny,allow - Deny from all - - - - - Order deny,allow - Deny from all - - Order deny,allow - Deny from all - - - -HERE -} -} 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 --- 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 +++ 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 @@ -1,7 +0,0 @@ -{ - - if ($port ne ${modSSL}{'TCPPort'}){ - $OUT = ' RewriteRule ^/zabbix(/.*|$) https://%{HTTP_HOST}/zabbix$1 [L,R]'; - } -} - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/00header 2009-02-02 22:37:27.000000000 +0100 +++ 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 @@ -1,19 +0,0 @@ -/* -** ZABBIX -** Copyright (C) 2000-2005 SIA Zabbix -** -** This program is free software; you can redistribute it and/or modify -** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2 of the License, or -** (at your option) any later version. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -** GNU General Public License for more details. -** -** You should have received a copy of the GNU General Public License -** along with this program; if not, write to the Free Software -** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -**/ - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/10database 2009-02-03 04:01:01.000000000 +0100 +++ 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 @@ -1,20 +0,0 @@ -global $DB; - -$DB["TYPE"] = "MYSQL"; -$DB["SERVER"] = "localhost"; -$DB["PORT"] = "0"; - -{ - -my $dbname = ${'zabbix-server'}{'DbName'} || 'zabbix'; -my $dbuser = ${'zabbix-server'}{'DbUser'} || 'zabbix'; -my $dbpass = ${'zabbix-server'}{'DbPassword'} || 'secret'; - -$OUT .=<<"HERE"; - -\$DB["DATABASE"] = "$dbname"; -\$DB["USER"] = "$dbuser"; -\$DB["PASSWORD"] = "$dbpass"; -HERE -} - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/20zbxserver 2009-02-02 22:44:33.000000000 +0100 +++ 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 @@ -1,10 +0,0 @@ -{ -my $port = ${'zabbix-server'}{'TCPPort'} || '10051'; - -$OUT .=<<"HERE"; - -\$ZBX_SERVER = "localhost"; -\$ZBX_SERVER_PORT = "$port"; -HERE -} - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix.conf.php/30images 2009-02-02 22:46:18.000000000 +0100 +++ 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 @@ -1 +0,0 @@ -$IMAGE_FORMAT_DEFAULT = IMAGE_FORMAT_PNG; 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/00header 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,4 @@ +# This is config file for ZABBIX server process +# To get more information about ZABBIX, +# go http://www.zabbix.com + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/10zabbixServers 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,10 @@ +############ GENERAL PARAMETERS ################# + +# IP address (or hostname) of ZABBIX servers. + +Server={ (${'zabbix-proxy'}{'Servers'} || '127.0.0.1'); } + +# Server port for sending active checks + +ServerPort={ (${'zabbix-proxy'}{'ServerPort'} || '10051'); } + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/15hostname 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,4 @@ + +# Unique hostname. + +Hostname={$SystemName.".".$DomainName;} 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/20instances 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,35 @@ +# Number of pre-forked instances of pollers +# Default value is 5 +# This parameter must be between 0 and 255 +StartPollers=5 + +# Number of pre-forked instances of IPMI pollers +# Default value is 0 +# This parameter must be between 0 and 255 +#StartIPMIPollers=0 + +# Number of pre-forked instances of pollers for unreachable hosts +# Default value is 1 +# This parameter must be between 0 and 255 +#StartPollersUnreachable=1 + +# Number of pre-forked instances of trappers +# Default value is 5 +# This parameter must be between 0 and 255 +StartTrappers=5 + +# Number of pre-forked instances of ICMP pingers +# Default value is 1 +# This parameter must be between 0 and 255 +StartPingers=1 + +# Number of pre-forked instances of discoverers +# Default value is 1 +# This parameter must be between 0 and 255 +StartDiscoverers=1 + +# Number of pre-forked instances of HTTP pollers +# Default value is 1 +# This parameter must be between 0 and 255 +#StartHTTPPollers=1 + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/30listen 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,16 @@ +# Listen port for trapper. Default port number is 10051. This parameter +# must be between 1024 and 32767 +{ +my $port = ${'zabbix-proxy'}{'TCPPort'} || '10051'; +$OUT .= "ListenPort=$port\n"; +} + +# Source IP address for outgouing connections +#SourceIP= + +# Listen interface for trapper. Trapper will listen all network interfaces +# if this parameter is missing. + +#ListenIP=127.0.0.1 + + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/40freq 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,34 @@ +# How often ZABBIX will perform sending hearbeat message +# (in seconds) +# Default value is 60 seconds +# Set to 0 to disable heartbeat messages +# This parameter must be between 0 and 3600 +#HeartbeatFrequency=60 + +# How often ZABBIX will perform sync configuration data +# (in seconds) +# Default value is 3600 seconds (1h) +# This parameter must be between 1 and 604800 (1 week) +#ConfigFrequency=3600 + + +# How often ZABBIX will perform housekeeping procedure +# (in hours) +# Default value is 1 hour +# Housekeeping is removing unnecessary information from +# tables history, alert, and alarms +# This parameter must be between 1 and 24 + +#HousekeepingFrequency=1 + +# How often ZABBIX will try to send unsent alerts +# (in seconds) +# Default value is 30 seconds +SenderFrequency=30 + +# Uncomment this line to disable housekeeping procedure +#DisableHousekeeping=1 + +# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds. +#PingerFrequency=60 + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/45proxybuffers 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,9 @@ +# Local bufer size in hours. Proxy will keep collected data N hours. +# Default value is 0 hours +#ProxyLocalBuffer=0 + +# Offline buffer size in hours. It is used when server is not available. +# Older data is removed. +# Default value is 1 hours +ProxyOfflineBuffer=24 + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/50debug 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,9 @@ +# Specifies debug level +# 0 - debug is not created +# 1 - critical information +# 2 - error information +# 3 - warnings (default) +# 4 - for debugging (produces lots of information) + +DebugLevel=3 + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/55timeout 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,17 @@ +# Specifies how long we wait for agent response (in sec) +# Must be between 1 and 30 +Timeout=5 + +# Specifies how many seconds trapper may spend processing new data +# Must be between 1 and 30 +#TrapperTimeout=5 + +# After how many seconds of unreachability treat a host as unavailable +#UnreachablePeriod=45 + +# How ofter check host for availability during the unreachability period +#UnavailableDelay=15 + +# How ofter check host for availability during the unavailability period +#UnavailableDelay=60 + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/60pidAndLog 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,13 @@ +# Name of PID file + +PidFile=/var/run/zabbix/zabbix_proxy.pid + +# Name of log file +# If not set, syslog is used + +LogFile=/var/log/zabbix/zabbix_proxy.log + +# Maximum size of log file in MB. Set to 0 to disable automatic log rotation. +LogFileSize=10 + + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/70location 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,17 @@ +# Location for custom alert scripts +AlertScriptsPath=/var/lib/zabbix/bin + +# Location of external scripts +ExternalScripts=/var/lib/zabbix/bin + +# Location of fping. Default is /usr/sbin/fping +# Make sure that fping binary has root permissions and SUID flag set +FpingLocation=/var/lib/zabbix/bin/fping + +# Location of fping6. Default is /usr/sbin/fping6 +# Make sure that fping binary has root permissions and SUID flag set +Fping6Location=/var/lib/zabbix/bin/fping6 + +# Temporary directory. Default is /tmp +TmpDir=/var/lib/zabbix/tmp + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_proxy.conf/80database 1970-01-01 01:00:00.000000000 +0100 +++ 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 @@ -0,0 +1,32 @@ +# Database host name +# Default is localhost + +DBHost=localhost + +# Database name +# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored. +{ +my $dbname = ${'zabbix-proxy'}{'DbName'} || 'zabbix'; +my $dbuser = ${'zabbix-proxy'}{'DbUser'} || 'zabbix'; +my $dbpass = ${'zabbix-proxy'}{'DbPassword'} || 'secret'; + +$OUT .=<<"HERE"; + +DBName=$dbname + +# Database user + +DBUser=$dbuser + +# Database password +# Comment this line if no password used + +DBPassword=$dbpass +HERE + +} + +# Connect to MySQL using Unix socket? + +DBSocket=/var/lib/mysql/mysql.sock + 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/00header 2009-02-02 19:58:13.000000000 +0100 +++ 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 @@ -1,4 +0,0 @@ -# This is config file for ZABBIX server process -# To get more information about ZABBIX, -# go http://www.zabbix.com - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/10NodeID 2009-02-03 03:55:05.000000000 +0100 +++ 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 @@ -1,11 +0,0 @@ -############ GENERAL PARAMETERS ################# - -# This defines unique NodeID in distributed setup, -# Default value 0 (standalone server) -# This parameter must be between 0 and 999 - -{ -my $nodeID = ${'zabbix-server'}{'NodeID'} || '0'; -$OUT .= "NodeID=$nodeID\n"; -} - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/20instances 2009-02-02 20:02:23.000000000 +0100 +++ 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 @@ -1,35 +0,0 @@ -# Number of pre-forked instances of pollers -# Default value is 5 -# This parameter must be between 0 and 255 -StartPollers=5 - -# Number of pre-forked instances of IPMI pollers -# Default value is 0 -# This parameter must be between 0 and 255 -#StartIPMIPollers=0 - -# Number of pre-forked instances of pollers for unreachable hosts -# Default value is 1 -# This parameter must be between 0 and 255 -#StartPollersUnreachable=1 - -# Number of pre-forked instances of trappers -# Default value is 5 -# This parameter must be between 0 and 255 -StartTrappers=5 - -# Number of pre-forked instances of ICMP pingers -# Default value is 1 -# This parameter must be between 0 and 255 -StartPingers=1 - -# Number of pre-forked instances of discoverers -# Default value is 1 -# This parameter must be between 0 and 255 -StartDiscoverers=1 - -# Number of pre-forked instances of HTTP pollers -# Default value is 1 -# This parameter must be between 0 and 255 -#StartHTTPPollers=1 - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/30listen 2009-02-02 20:22:12.000000000 +0100 +++ 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 @@ -1,16 +0,0 @@ -# Listen port for trapper. Default port number is 10051. This parameter -# must be between 1024 and 32767 -{ -my $port = ${'zabbix-server'}{'TCPPort'} || '10051'; -$OUT .= "ListenPort=$port\n"; -} - -# Source IP address for outgouing connections -#SourceIP= - -# Listen interface for trapper. Trapper will listen all network interfaces -# if this parameter is missing. - -#ListenIP=127.0.0.1 - - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/40freq 2009-02-02 20:31:15.000000000 +0100 +++ 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 @@ -1,20 +0,0 @@ -# How often ZABBIX will perform housekeeping procedure -# (in hours) -# Default value is 1 hour -# Housekeeping is removing unnecessary information from -# tables history, alert, and alarms -# This parameter must be between 1 and 24 - -#HousekeepingFrequency=1 - -# How often ZABBIX will try to send unsent alerts -# (in seconds) -# Default value is 30 seconds -SenderFrequency=30 - -# Uncomment this line to disable housekeeping procedure -#DisableHousekeeping=1 - -# Frequency of ICMP pings (item keys 'icmpping' and 'icmppingsec'). Defauls is 60 seconds. -#PingerFrequency=60 - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/50debug 2009-02-02 20:24:38.000000000 +0100 +++ 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 @@ -1,9 +0,0 @@ -# Specifies debug level -# 0 - debug is not created -# 1 - critical information -# 2 - error information -# 3 - warnings (default) -# 4 - for debugging (produces lots of information) - -DebugLevel=3 - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/60pidAndLog 2009-02-02 20:27:18.000000000 +0100 +++ 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 @@ -1,13 +0,0 @@ -# Name of PID file - -PidFile=/var/run/zabbix/zabbix.pid - -# Name of log file -# If not set, syslog is used - -LogFile=/var/log/zabbix/zabbix_server.log - -# Maximum size of log file in MB. Set to 0 to disable automatic log rotation. -LogFileSize=10 - - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/70location 2009-02-27 14:22:44.000000000 +0100 +++ 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 @@ -1,17 +0,0 @@ -# Location for custom alert scripts -AlertScriptsPath=/var/lib/zabbix/bin - -# Location of external scripts -ExternalScripts=/var/lib/zabbix/bin - -# Location of fping. Default is /usr/sbin/fping -# Make sure that fping binary has root permissions and SUID flag set -FpingLocation=/var/lib/zabbix/bin/fping - -# Location of fping6. Default is /usr/sbin/fping6 -# Make sure that fping binary has root permissions and SUID flag set -Fping6Location=/var/lib/zabbix/bin/fping6 - -# Temporary directory. Default is /tmp -TmpDir=/var/lib/zabbix/tmp - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/etc/zabbix/zabbix_server.conf/80database 2009-02-02 20:36:29.000000000 +0100 +++ 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 @@ -1,32 +0,0 @@ -# Database host name -# Default is localhost - -DBHost=localhost - -# Database name -# SQLite3 note: path to database file must be provided. DBUser and DBPassword are ignored. -{ -my $dbname = ${'zabbix-server'}{'DbName'} || 'zabbix'; -my $dbuser = ${'zabbix-server'}{'DbUser'} || 'zabbix'; -my $dbpass = ${'zabbix-server'}{'DbPassword'} || 'secret'; - -$OUT .=<<"HERE"; - -DBName=$dbname - -# Database user - -DBUser=$dbuser - -# Database password -# Comment this line if no password used - -DBPassword=$dbpass -HERE - -} - -# Connect to MySQL using Unix socket? - -DBSocket=/var/lib/mysql/mysql.sock - 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 --- smeserver-zabbix-proxy-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all 2009-02-27 14:22:44.000000000 +0100 +++ 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 @@ -1,9 +0,0 @@ - -echo "$3" | \ - sendxmpp -u {${'zabbix-server'}{'JabberAccount'};} \ - -p {${'zabbix-server'}{'JabberPassword'};} \ - -j {${'zabbix-server'}{'JabberServer'};} \ - -r zabbix \ - {(${'zabbix-server'}{'JabberTLS'} || 'enabled') eq 'disabled' ? '':'-t \\';} - -s "$2" "$1" - 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 --- 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 +++ 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 @@ -0,0 +1 @@ +PERMS=0750 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 --- 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 +++ 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 @@ -1 +0,0 @@ -PERMS=0750