Author: glen Date: Mon Oct 30 11:57:36 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- add ssl support
---- Files affected:
SOURCES:
nagios-jabber.alert (1.2 -> 1.3) , mon-jabber.alert (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/nagios-jabber.alert
diff -u SOURCES/nagios-jabber.alert:1.2 SOURCES/nagios-jabber.alert:1.3
--- SOURCES/nagios-jabber.alert:1.2 Mon Oct 30 11:44:08 2006
+++ SOURCES/nagios-jabber.alert Mon Oct 30 12:57:31 2006
@@ -1,6 +1,7 @@
#!/usr/bin/python -u
# [EMAIL PROTECTED], 2006-01
# [EMAIL PROTECTED], 2006-03-14
+# [EMAIL PROTECTED],[EMAIL PROTECTED], 2006-10-30 - added ssl support (for
gmail.com)
# usage:
# jabber.alert -J from_jid -P password to_jid1 to_jid2 to_jid3
@@ -14,6 +15,7 @@
from pyxmpp.jid import JID
from pyxmpp.message import Message
from pyxmpp.jabber.client import JabberClient
+from pyxmpp.streamtls import TLSSettings
try:
opts, args = getopt.getopt(sys.argv[1:], "J:P:")
@@ -66,7 +68,8 @@
msg = Message(to_jid = jid_r, body = body, subject =
subject, stanza_type = message_type)
self.stream.send(msg)
self.disconnect()
-c = Client(jid, password, server = server, port = port)
+
+c = Client(jid, password, server = server, port = port, auth_methods =
['sasl:PLAIN'], tls_settings = TLSSettings(require = True, verify_peer = False))
c.connect()
try:
c.loop(1)
================================================================
Index: SOURCES/mon-jabber.alert
diff -u SOURCES/mon-jabber.alert:1.2 SOURCES/mon-jabber.alert:1.3
--- SOURCES/mon-jabber.alert:1.2 Mon Oct 30 11:44:08 2006
+++ SOURCES/mon-jabber.alert Mon Oct 30 12:57:31 2006
@@ -1,5 +1,6 @@
#!/usr/bin/python -u
-# [EMAIL PROTECTED], 01/2006
+# [EMAIL PROTECTED], 2006-01
+# [EMAIL PROTECTED],[EMAIL PROTECTED], 2006-10-30 - added ssl support (for
gmail.com)
# usage:
# jabber.alert -J from_jid -P password to_jid1 to_jid2 to_jid3
@@ -13,6 +14,7 @@
from pyxmpp.jid import JID
from pyxmpp.message import Message
from pyxmpp.jabber.client import JabberClient
+from pyxmpp.streamtls import TLSSettings
try:
opts, args = getopt.getopt(sys.argv[1:], "s:o:g:h:k:t:J:P:OTu")
@@ -116,7 +118,8 @@
msg=Message(to_jid=jid_r, body=body, subject=subject,
stanza_type=message_type)
self.stream.send(msg)
self.disconnect()
-c=Client(jid,password,server=server,port=port)
+
+c = Client(jid, password, server = server, port = port, auth_methods =
['sasl:PLAIN'], tls_settings = TLSSettings(require = True, verify_peer = False))
c.connect()
try:
c.loop(1)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/nagios-jabber.alert?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/mon-jabber.alert?r1=1.2&r2=1.3&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
