A bunch of small fixes

salt/__init__.py

@@ -54,7 +54,8 @@ class Master(object):
         '''
         Run the sequence to start a salt master server
         '''
-        verify_env([self.opts['pki_dir'], self.opts['cachedir']])
+        verify_env([os.path.join(self.opts['pki_dir'], 'minions'),
+                    self.opts['cachedir']])
         master = salt.master.Master(self.opts)
         if self.cli['daemon']:
             salt.utils.daemonize()

salt/config.py

@@ -30,7 +30,6 @@ def minion_config(path):
             sys.stderr.write(err + '\n')
 
     opts['master_uri'] = 'tcp://' + opts['master'] + ':' + opts['master_port']
-    opts['aes'] = salt.crypt.Crypticle.generate_key_string()
 
     return opts
 
@@ -56,4 +55,6 @@ def master_config(path):
                 + ' please check your configuration file.\nUsing defaults'
             sys.stderr.write(err + '\n')
     
+    opts['aes'] = salt.crypt.Crypticle.generate_key_string()
+
     return opts

salt/master.py

@@ -102,7 +102,7 @@ class ReqServer(threading.Thread):
         while True:
             package = socket.recv()
             payload = salt.payload.unpackage(package)
-            ret = self.payload.package(self._handle_payload(payload))
+            ret = salt.payload.package(self._handle_payload(payload))
             socket.send(ret)
 
     def __bind(self):