From 227792e1589dcb2fb976a98a993e52ce584c947a Mon Sep 17 00:00:00 2001 From: Mike Place Date: Thu, 5 Nov 2015 12:04:24 -0700 Subject: [PATCH 1/2] Set restrictive umask on module sync Fixes #28398 --- salt/modules/saltutil.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/modules/saltutil.py b/salt/modules/saltutil.py index 1f723fc817..087ebb57cb 100644 --- a/salt/modules/saltutil.py +++ b/salt/modules/saltutil.py @@ -92,6 +92,7 @@ def _sync(form, saltenv=None): remote = set() source = os.path.join('salt://_{0}'.format(form)) mod_dir = os.path.join(__opts__['extension_modules'], '{0}'.format(form)) + cumask = os.umask(0o77) if not os.path.isdir(mod_dir): log.info('Creating module dir {0!r}'.format(mod_dir)) try: @@ -159,6 +160,7 @@ def _sync(form, saltenv=None): mod_file = os.path.join(__opts__['cachedir'], 'module_refresh') with salt.utils.fopen(mod_file, 'a+') as ofile: ofile.write('') + os.umask(cumask) return ret From 4ea28bed30ca0620b21cad29f1451976927e2ca2 Mon Sep 17 00:00:00 2001 From: Forrest Alvarez Date: Thu, 5 Nov 2015 12:25:45 -0800 Subject: [PATCH 2/2] Update puppet module wording --- salt/modules/puppet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/puppet.py b/salt/modules/puppet.py index 3f60c1356e..5225055520 100644 --- a/salt/modules/puppet.py +++ b/salt/modules/puppet.py @@ -238,7 +238,7 @@ def disable(message=None): .. code-block:: bash salt '*' puppet.disable - salt '*' puppet.disable 'disabled for a good reason' + salt '*' puppet.disable 'Disabled, contact XYZ before enabling' ''' _check_puppet()