New preference domain

scripts/Makefile

@@ -3,7 +3,7 @@ include /usr/local/share/luggage/luggage.make
 PACKAGE_VERSION=0.2.4
 TITLE=sal_scripts
 PACKAGE_NAME=sal_scripts
-REVERSE_DOMAIN=com.grahamgilbert
+REVERSE_DOMAIN=com.salsoftware
 PAYLOAD=\
 	pack-yaml \
 	pack-sal-submit

scripts/sal-postflight

@@ -25,7 +25,7 @@ import os
 import sys
 import optparse
 
-BUNDLE_ID = 'com.grahamgilbert.sal'
+BUNDLE_ID = 'com.salsoftware.sal'
 default_debug = False
 
 def get_disk_size(path='/'):
@@ -122,13 +122,19 @@ try:
     f = open('/var/lib/puppet/state/last_run_summary.yaml', 'r')
     puppetreport = yaml.load(f.read())
     report['Puppet'] = puppetreport
+
+    if report['Puppet']['version']['config'] == None:
+        report['Puppet']['version']['config'] = 'None'
+
     if debug:
         print 'DEBUG: Puppet Report'
         print report['Puppet']
 except:
     pass
 
 # Merge the system profiler report into the Munki report
+if not report['MachineInfo']:
+    report['MachineInfo'] = {}
 report['MachineInfo']['SystemProfile'] = system_profile
 if debug:
     print 'DEBUG: System Profile'

setup/requirements.txt

@@ -3,11 +3,11 @@ South==0.8.2
 Yapsy==1.10.223
 django-bootstrap3==4.11.0
 docutils==0.11
-puppetdb==0.0.1
 requests==2.5.0
 wsgiref==0.1.2
 python-dateutil==2.2
 pytz==2014.3
 pyOpenSSL==0.14
 ndg-httpsclient==0.3.2
-pyasn1==0.1.7
+pyasn1==0.1.7
+urllib3==1.10