--- a/autobot/template.py	Tue Jul 31 09:49:57 2012 -0700
+++ b/autobot/template.py	Tue Jul 31 13:15:40 2012 -0700
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 
 """
-templates for the A*Team's buildbot
+makeitso templates for the A*Team's buildbot
 """
 
+import mozinfo
 import os
 import string
 import sys
@@ -21,14 +22,7 @@
     from subprocess import call
 
 # default OS type
-# XXX this should use MozInfo when that's ready
-os_type=None
-if sys.platform.startswith('linux'):
-    os_type = 'linux'
-elif sys.platform.startswith('darwin'):
-    os_type = 'mac'
-elif sys.platform.startswith('win'):
-    os_type = 'win'
+os_type = mozinfo.os
 
 def print_descriptions():
     """print factory descriptions"""
@@ -54,7 +48,9 @@
             Variable('publichtmlport', 'port for public waterfall display', default=8011, cast=int),
             Variable('botname', 'name of IRC bot', default='autobot-test'), # use autobot in production
             Variable('ircHost', 'IRC host', default='irc.mozilla.org'),
-            Variable('ircChannels', 'channels for the IRC bot ("-" for none)', default='#ateam-test') # use #ateam in production
+            Variable('ircChannels', 'channels for the IRC bot ("-" for none)', default='#ateam-test'), # use #ateam in production
+            Variable('domain', 'autobot domain name', default='localhost'),
+            Variable('recipients', 'email recipients for all projects')
             ]
 
     def pre(self, variables, output):