X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=config%2Fstatic%2Fconf.d%2Fcontacts.cfg;h=60a7083eae5c1e984c460cda2a3a07a94b90f9f6;hb=65026f9c26a94ee7d3cd70bd5c81beff554906f6;hp=da101a2e1ac954c5c5bc1bac2925b2182cb9570b;hpb=cfde3be4a98cc9ded78a93349efe4448b2cfa942;p=mirror%2Fdsa-nagios.git

diff --git a/config/static/conf.d/contacts.cfg b/config/static/conf.d/contacts.cfg
index da101a2..60a7083 100644
--- a/config/static/conf.d/contacts.cfg
+++ b/config/static/conf.d/contacts.cfg
@@ -71,7 +71,7 @@ define contact{
 	host_notification_options       d,r
 	service_notification_commands   notify-service-by-email
 	host_notification_commands      notify-host-by-email
-	email                           dannf@dannf.org?
+	email                           dannf@dannf.org
 	}
 
 define contact{
@@ -119,7 +119,7 @@ define contact{
 	host_notification_options       d,r
 	service_notification_commands   notify-service-by-email
 	host_notification_commands      notify-host-by-email
-	email                           lucaf+dsa@ece.ubc.ca
+	email                           lucaf+dsa@emyr.net
 	}
 
 define contact{
@@ -166,6 +166,50 @@ define contact{
 	host_notification_commands      notify-host-by-email
 	email                           steve@lobefin.net
 	}
+define contact{
+	contact_name                    faw
+	alias                           Felipe Augusto van de Wiel
+	service_notification_period     24x7
+	host_notification_period        24x7
+	service_notification_options    w,u,c,r
+	host_notification_options       d,r
+	service_notification_commands   notify-service-by-email
+	host_notification_commands      notify-host-by-email
+	email                           faw@debian.org
+	}
+define contact{
+	contact_name                    tfheen
+	alias                           Tollef Fog Heen
+	service_notification_period     never
+	host_notification_period        never
+	service_notification_options    n
+	host_notification_options       n
+	service_notification_commands   notify-service-by-email
+	host_notification_commands      notify-host-by-email
+	email                           tfheen@debian.org
+	}
+define contact{
+	contact_name                    paravoid
+	alias                           Faidon Liambotis
+	service_notification_period     never
+	host_notification_period        never
+	service_notification_options    n
+	host_notification_options       n
+	service_notification_commands   notify-service-by-email
+	host_notification_commands      notify-host-by-email
+	email                           paravoid@debian.org
+	}
+define contact{
+	contact_name                    alioth-nsa
+	alias                           IRC bot for alioth notifications
+	service_notification_period     24x7
+	host_notification_period        24x7
+	service_notification_options    w,u,c,r
+	host_notification_options       d,r
+	service_notification_commands   notify-service-by-email
+	host_notification_commands      notify-host-by-email
+	email                           alioth-nagios@commit.noreply.org
+	}
 
 
 ###############################################################################
@@ -182,5 +226,17 @@ define contact{
 define contactgroup{
         contactgroup_name       dsa
         alias                   Debian System Administrators
-        members                 weasel, zobel, sgran
+        members                 weasel, zobel, sgran, paravoid, tfheen
+        }
+
+define contactgroup{
+        contactgroup_name       buildd
+        alias                   Debian Buildd Admins
+        members                 luk, pkern, HE
+        }
+
+define contactgroup{
+        contactgroup_name       alioth-admins
+        alias                   Debian Alioth admins
+        members                 sgran, tfheen, alioth-nsa
         }