Fixing the path that the gpg module uses if the user is salt to be pulled from salt.syspaths. Similar fix to saltstack#18968

garethgreenaway · garethgreenaway · commit e39557b2a953 · 2014-12-12T20:55:12.000-08:00
diff --git a/salt/modules/gpg.py b/salt/modules/gpg.py
@@ -14,11 +14,13 @@
 # Import python libs
 import distutils.version  # pylint: disable=import-error,no-name-in-module
 import logging
+import os
 import re
 import time
 
 # Import salt libs
 import salt.utils
+import salt.syspaths
 from salt.ext.six import string_types
 
 from salt.exceptions import (
@@ -107,6 +109,7 @@ def _create_gpg(user=None):
 
     if user == 'salt':
         homeDir = '/etc/salt/gpg'
+        homeDir = os.path.join(salt.syspaths.CONFIG_DIR, 'gpg')
     else:
         userinfo = __salt__['user.info'](user)
         if userinfo:
