Merge

1 files changed, 24 insertions, 7 deletions

diff --git a/etc/mauveserver.conf b/etc/mauveserver.conf
index 4baec0a..0a7a747 100644
--- a/etc/mauveserver.conf
+++ b/etc/mauveserver.conf
@@ -75,8 +75,8 @@ notification_method("email") {
 #   password "x"
 # }
 
-# How to notify by SMS - we use aql.com, you'll need to write a module
-# to use any other provider.
+# How to notify by SMS - we use aql.com, a provider for clockworksms.com
+# is also provided. For another provider, you'll need to write a module.
 #
 # notification_method("sms") {
 #   provider "AQL"
@@ -88,6 +88,16 @@ notification_method("email") {
 #   # Maximum number of SMS messages to concatenate for one notification
 #   max_messages_per_alert 3
 # }
+#
+# notification_method("sms") {
+#   provider "Clockwork"
+# 
+#   apikey "sssseeeeeeccccccccrrrrreeeeeettttsssssss"
+#   from "01234567890"
+#
+#   # Maximum number of SMS messages to concatenate for one notification
+#   max_messages_per_alert 3
+# }
 
 # Simple default notification preference for root at this machine, at all
 # alert levels.  You probably want more people, see below for a more complete
@@ -101,16 +111,20 @@ person("root") {
 #
 # person("johnny") {
 #
+#   sms "07111222333"
+#   email "johnny@example.com"
+#   xmpp "johnny@example.com.jabber.org"
+#
 #   # Johnny wants waking up 24/7 if anything urgent happens
-#   urgent { sms("07111222333") }
+#   urgent { sms }
 #
-#   # Email him for anything that's not urgent
-#   normal { email("johnny@example.com") }
+#   # XMPP, or Email him for anything that's not urgent
+#   normal { xmpp or email }
 #
 #   # Anything else can just be a jabber message, which he might miss.
 #   # Email instead if he's unavailable/offline - but give it a try if
 #   # we don't know his status.
-#   low { xmpp("johnny@example.com.jabber.org", :if_presence => [:available, unknown]) || email("johnny@example.com") }
+#   low { xmpp("johnny@example.com.jabber.org", :if_presence => [:available, unknown]) || email }
 #
 #   # SMS messages are expensive, if we're sending more than 5 per minute,
 #   # tell the user we're going to stop until it slows down.
@@ -122,7 +136,10 @@ person("root") {
 # Archie is Johnny's boss
 #
 # person("archie") {
-#   all { email("archie@example.com") }
+#
+#   email "archie@example.com"
+#
+#   all { email }
 #
 #   # Don't spam Archie, if more than 3 messages per hour come in.
 #   suppress_notifications_after 3 => 1.hour