Rolled back changes to mauverserver/example.conf which I shouldn't have

committed.

2 files changed, 30 insertions, 25 deletions

diff --git a/bin/mauveserver b/bin/mauveserver
index cc2b124..b0c3573 100644
--- a/bin/mauveserver
+++ b/bin/mauveserver
@@ -34,8 +34,6 @@
 #  Patrick J Cherry <patrick@bytemark.co.uk>
 #
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__),"..","lib"))
-
 help = manual = verbose = version = test = false
 while arg = ARGV.pop
   case arg
diff --git a/example.conf b/example.conf
index 347c33d..4123d8e 100644
--- a/example.conf
+++ b/example.conf
@@ -5,18 +5,13 @@ server {
   #
   # This is where our database lives.  SQLite is the default.
   #
-
-  # database "sqlite3::memory:"
-  database    "postgres://localhost/mauvealert"
+  database "sqlite3::memory:"
 
   #
   # This is our hostname.  It gets used when URLs are generated, and in the heartbeat alert.
   #
   hostname "mauve.example.com"
 
-#  use_packet_buffer "no"
-#  use_notification_buffer "no"
-
   #
   # This is the UDP listener.
   #
@@ -32,7 +27,7 @@ server {
     #
     # This is how long the UDP server will sleep between looking for packets.
     # 
-    poll_every 0
+    poll_every 1
   }
   
 
@@ -45,7 +40,7 @@ server {
     # This is the length of time the processor will sleep between checking for
     # new packets from the UDP listener.
     #
-    poll_every 0
+    poll_every 1
 
     #
     # In order to make sure the same transmission isn't received more then
@@ -83,23 +78,23 @@ server {
   # This is where the mauve server sends its own heartbeat.  Useful for
   # watching the watcher.
   #
-#  heartbeat {
+  heartbeat {
     #
     # If no destination is specified, then the contents of
     # /etc/mauvealert/mauvesend.destination are used.
     #
-#    destination "localhost"
+    destination "localhost"
     #
     # This is how long to wait before the alert is raised
     #
-#    raise_after    600
+    raise_after    600
     #
     # These two fields have sensible defaults set, but more informative
     # messages can be set here.
     #
-#    summary     "Mauve alert server is down"
-#    detail      "The Mauve alert server has failed to send a heartbeat"
-#  }
+    summary     "Mauve alert server is down"
+    detail      "The Mauve alert server has failed to send a heartbeat"
+  }
 
 }
 
@@ -142,7 +137,7 @@ logger {
   outputter("file") {
     filename "/tmp/mauveserver.log"
     trunc    true 
-    level    Log4r::INFO
+    level    Log4r::DEBUG
   }
 
 #  outputter("email") {
@@ -159,16 +154,24 @@ logger {
 # XMPP instant messaging.  This are the credentials to log into the XMPP
 # account that mauve will use.
 #
-# XMPP instant messaging.
-notification_method ("xmpp") {
-  jid "bytemark@chat.bytemark.co.uk/pjc-test"
-  password "OsPzCmqSb"
+#notification_method ("xmpp") {
+#  jid      "mauve@chat.example.com/mauve"
+#  password "mauvespassword"
+#}
+
+#
+# Email messaging.
+#
+notification_method ("email") {
+  server         "localhost"
+  from           "mauve@desk1.tur.bytemark.co.uk"
+  subject_prefix "mauve-test"
 }
 
 person("office_chat") {
-  xmpp "muc:mauve-test@conference.chat.bytemark.co.uk/MauveAlert"
-  all { xmpp }
- suppress_notifications_after(310 => 1.minute)
+#  xmpp "muc:mauve-test@conference.chat.bytemark.co.uk/MauveAlert"
+#  all { xmpp }
+# suppress_notifications_after(310 => 1.minute)
 }
 
 person ("pcherry") {
@@ -176,13 +179,17 @@ person ("pcherry") {
   all { true }
 }
 
+people_list ("arse") {
+  list [ "office_chat" ] 
+}
+
 # 
 # Default notification - tell root about all alerts every hour
 # 
 alert_group("default") {
   level URGENT 
 
-  notify("office_chat") {
+  notify("arse") {
     every 2.minutes
   }
 }