1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/createlinks mezzanine_patched_smeserver-zabbix-server-0.1/createlinks |
2 |
|
|
--- smeserver-zabbix-server-0.1/createlinks 2009-03-02 16:30:41.000000000 +0100 |
3 |
|
|
+++ mezzanine_patched_smeserver-zabbix-server-0.1/createlinks 2009-03-02 16:30:22.000000000 +0100 |
4 |
|
|
@@ -10,6 +10,7 @@ |
5 |
|
|
templates2events("/etc/zabbix/zabbix.conf.php", qw(zabbix-server-update bootstrap-console-save)); |
6 |
|
|
templates2events("/etc/sudoers", $event); |
7 |
|
|
templates2events("/var/lib/zabbix/bin/sendxmpp", $event); |
8 |
|
|
+templates2events("/var/lib/zabbix/.sendxmpprc", $event); |
9 |
|
|
templates2events("/etc/e-smith/sql/init/80zabbix-server", qw(zabbix-server-update bootstrap-console-save)); |
10 |
|
|
templates2events("/etc/rc.d/init.d/masq", $event); |
11 |
|
|
|
12 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all |
13 |
|
|
--- smeserver-zabbix-server-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all 2009-03-02 16:30:41.000000000 +0100 |
14 |
|
|
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates/var/lib/zabbix/bin/sendxmpp/all 2009-03-02 16:29:11.000000000 +0100 |
15 |
|
|
@@ -1,9 +1,6 @@ |
16 |
|
|
|
17 |
|
|
echo "$3" | \ |
18 |
|
|
- sendxmpp -u {${'zabbix-server'}{'JabberAccount'};} \ |
19 |
|
|
- -p {${'zabbix-server'}{'JabberPassword'};} \ |
20 |
|
|
- -j {${'zabbix-server'}{'JabberServer'};} \ |
21 |
|
|
- -r zabbix \ |
22 |
|
|
+ sendxmpp -r zabbix \ |
23 |
|
|
{(${'zabbix-server'}{'JabberTLS'} || 'enabled') eq 'disabled' ? '':'-t \\';} |
24 |
|
|
-s "$2" "$1" |
25 |
|
|
|
26 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/bin/sendxmpp mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/bin/sendxmpp |
27 |
|
|
--- smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/bin/sendxmpp 2009-03-02 16:30:41.000000000 +0100 |
28 |
|
|
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/bin/sendxmpp 2009-03-02 16:29:56.000000000 +0100 |
29 |
|
|
@@ -1,3 +1,4 @@ |
30 |
|
|
PERMS=0750 |
31 |
|
|
UID="root" |
32 |
|
|
GID="zabbix" |
33 |
|
|
+ |
34 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/.sendxmpprc mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/.sendxmpprc |
35 |
|
|
--- smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/.sendxmpprc 1970-01-01 01:00:00.000000000 +0100 |
36 |
|
|
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/etc/e-smith/templates.metadata/var/lib/zabbix/.sendxmpprc 2009-03-02 16:25:55.000000000 +0100 |
37 |
|
|
@@ -0,0 +1,3 @@ |
38 |
|
|
+PERMS=0600 |
39 |
|
|
+UID="zabbix" |
40 |
|
|
+GID="zabbix" |
41 |
|
|
diff -Nur -x '*.orig' -x '*.rej' smeserver-zabbix-server-0.1/root/var/lib/zabbix/.sendxmpprc/all mezzanine_patched_smeserver-zabbix-server-0.1/root/var/lib/zabbix/.sendxmpprc/all |
42 |
|
|
--- smeserver-zabbix-server-0.1/root/var/lib/zabbix/.sendxmpprc/all 1970-01-01 01:00:00.000000000 +0100 |
43 |
|
|
+++ mezzanine_patched_smeserver-zabbix-server-0.1/root/var/lib/zabbix/.sendxmpprc/all 2009-03-02 16:24:35.000000000 +0100 |
44 |
|
|
@@ -0,0 +1,3 @@ |
45 |
|
|
+# Jabber Account for zabbix alerts |
46 |
|
|
+{${'zabbix-server'}{'JabberAccount'}}@{${'zabbix-server'}{'JabberServer'}} {${'zabbix-server'}{'JabberPassword'}} |
47 |
|
|
+ |