valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
96,000 Commits 24 Branches 182 Tags 341 MiB
9a34bcda10
Commit Graph

96000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
39e633f23c
Merge pull request #51246 from garethgreenaway/bp-50358 
[2017.7] Backport #50358 to 2017.7
 2019-01-19 18:36:18 +00:00
Gareth J. Greenaway
4251c0cb92
Merge branch '2018.3' into 51208_file_manage_escaped_double_quotes 2019-01-19 08:42:06 -08:00
Gareth J. Greenaway
b9a0705a83
Merge branch '2018.3' into tag_manager 2019-01-18 17:34:41 -08:00
Gareth J. Greenaway
8f8ebbc227
Merge pull request #51226 from garethgreenaway/51195_handle_spaces_in_fstab_opts 
[2018.3] Handle spaces in fstab opts, similar fix to #39593
 2019-01-18 17:30:58 -08:00
Gareth J. Greenaway
1902ce83a7
Merge branch '2018.3' into 51195_handle_spaces_in_fstab_opts 2019-01-18 15:03:12 -08:00
Gareth J. Greenaway
6a9daa7440
Merge branch '2018.3' into 51208_file_manage_escaped_double_quotes 2019-01-18 14:56:24 -08:00
Gareth J. Greenaway
210238ba67
Merge branch '2018.3' into tag_manager 2019-01-18 14:49:10 -08:00
Gareth J. Greenaway
e3a9e99320
Merge pull request #51233 from Ch3LL/bp-51105 
Backport #51105 to 2018.3
 2019-01-18 14:44:32 -08:00
Gareth J. Greenaway
0bf468c357
Fixing lint. Using a constant intead of looking for the condition in the string. 2019-01-18 12:45:09 -08:00
Gareth J. Greenaway
a233dbc79a
Ensuring we can handle a string that contains single quote + an escaped double quote. 2019-01-18 12:45:09 -08:00
Gareth J. Greenaway
c33c5589ca
Backport #50358 to 2017.7 2019-01-18 12:16:03 -08:00
Gareth J. Greenaway
827d6c3722
Merge branch '2018.3' into tag_manager 2019-01-18 11:54:43 -08:00
Gareth J. Greenaway
eef49e8999
Merge branch '2018.3' into bp-51105 2019-01-18 11:50:41 -08:00
Gareth J. Greenaway
e53e9b16b3
Merge pull request #51230 from Ch3LL/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2019-01-18 11:50:09 -08:00
Gareth J. Greenaway
c3520aa006
Accounting for when permissions are not returned from file.check_perms, eg. windows systems. 2019-01-17 17:32:58 -05:00
Gareth J. Greenaway
cd80548e79
When test=True and there are permissions changes, report it. 2019-01-17 17:31:23 -05:00
Erik Johnson
4a614775e4
Clarify documentation for the the gitfs "all_saltenvs" config param 2019-01-17 16:02:21 -06:00
Ch3LL
0ef76755db
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/modules/capirca_acl.py
 2019-01-17 16:11:12 -05:00
Gareth J. Greenaway
89345eb1ab
Handle spaces in fstab opts, similar fix to #39593 2019-01-17 12:06:34 -08:00
Jamie Bliss
6e7da9577d
Add the tokens system. 
Also update the no-fs flag on the thorium system.
 2019-01-17 14:56:44 -05:00
Jamie Bliss
7e2838ca92
Add reference to the execution module docs 2019-01-17 14:16:51 -05:00
Jamie Bliss
f30f9e81e7
Remove search system 2019-01-17 14:08:23 -05:00
Jamie Bliss
f0cc183823
Fileserver modules can be loaded from the fileserver. 2019-01-17 14:07:25 -05:00
Daniel Wozniak
26008ef26c
Merge pull request #51212 from sathieu/file_roots_slash 
Allow slashes in file_roots envs.
 2019-01-17 10:29:17 -07:00
Mathieu Parent
b769f18085
Allow slash in file_roots envs 
Fixes: #51211
 2019-01-17 17:03:38 +01:00
Mathieu Parent
f9437e2590
Test for file_roots envs with slash leads to "No such file or directory" 
See #51211.

2019-01-08 09:57:23,653 [salt.master      :1795][ERROR   ][28091] Error in function _file_list:
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/salt/master.py", line 1788, in run_func
    ret = getattr(self, func)(load)
  File "/usr/lib/python2.7/dist-packages/salt/utils/decorators/__init__.py", line 594, in wrapped
    **salt.utils.data.decode_dict(kwargs)
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 752, in file_list
    ret.update(self.servers[fstr](load))
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 422, in file_list
    return _file_lists(load, 'files')
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/roots.py", line 310, in _file_lists
    __opts__, form, list_cache, w_lock
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 122, in check_file_list_cache
    if not os.path.isfile(list_cache) and _lock_cache(w_lock):
  File "/usr/lib/python2.7/dist-packages/salt/fileserver/__init__.py", line 56, in _lock_cache
    os.mkdir(w_lock)
OSError: [Errno 2] No such file or directory: '/var/cache/salt/master/file_lists/roots/.foo/bar.w'
 2019-01-17 17:03:33 +01:00
Martin Ruckli
a85f1465d5
fixes #31179 by appling the same logic as used in the nexus module 
(cherry picked from commit eb7fb38a80)
 2019-01-17 16:59:06 +01:00
Shane Lee
5916282144
Merge pull request #51209 from garethgreenaway/bp-51124 
[2018.3] Back-port PR #51124 to 2018.3
 2019-01-17 06:28:31 -07:00
Pedro Algarvio
8e23a6cb63
Add missing import 2019-01-17 13:13:59 +00:00
Ch3LL
82acce47cd
Handle encoding when opening file for both py2/py3 
Conflicts:
	setup.py
 2019-01-16 19:09:25 -08:00
twangboy
b91b2c62f5
Backport PR# 50771 to 2018.3 branch 2019-01-16 15:54:17 -07:00
Erik Johnson
31ca7c6936
Fix usage of reload for PY3 compatibility 
This also normalizes some hacks that were in place to import reload from
importlib, so that these instances also use the compatibility function.
 2019-01-16 16:37:41 -06:00
Ch3LL
fcdfe6943f
Add Google Tag Manager to Docs 2019-01-16 15:30:45 -05:00
Daniel A. Wozniak
b69c002e68
Fix saltmod roster test 2019-01-16 11:20:05 -07:00
Daniel A. Wozniak
2594f246e5
Roster defines the roster system not a file 2019-01-16 11:18:41 -07:00
Daniel Wozniak
094bd33279
Merge pull request #51184 from twangboy/fix_auditpol 
Fix win_lgpo_auditpol salt util on Windows
 2019-01-16 11:08:00 -07:00
Daniel Wozniak
ac719226c0
Merge pull request #51191 from Ch3LL/bp-50918 
Backport #50918 into 2018.3
 2019-01-16 11:02:18 -07:00
twangboy
7300d84d54
Skip debian tests on Windows 2019-01-16 09:31:37 -05:00
twangboy
4622433f84
Fix test_debian_ip on Windows 2019-01-16 09:31:33 -05:00
twangboy
2e68d35678
directly call cmd.run_all 
Apparently, you can't always use __salt__ in a util
 2019-01-15 18:09:36 -07:00
Erik Johnson
9951b8dcf1
Fix possible oversight in nodegroup modifications 
b3e2f38 enhanced nodegroup matching to allow sequences. However, the
list of regex special characters appears to have been improperly
formatted.
 2019-01-15 13:17:26 -06:00
Daniel Wozniak
e7f53a3df0
Merge pull request #51144 from jgleissner/2018.3-azurearm-py3 
2018.3 azurearm py3
 2019-01-15 09:46:34 -07:00
Daniel Wozniak
1206f92357
Merge pull request #51171 from twangboy/fix_crypt 
Add random sleep time to avoid overloading Windows
 2019-01-15 09:45:32 -07:00
Daniel Wozniak
a96deed641
Merge pull request #51174 from jpsv/2018.3 
Update OpsGenie to use their V2 API (2018.3)
 2019-01-15 09:44:53 -07:00
Daniel Wozniak
563d4875b8
Merge pull request #51010 from amendlik/ldap-groups 
Allow unauthenticated bind for listing LDAP groups
 2019-01-15 09:43:41 -07:00
Daniel Wozniak
6dc375226d
Merge pull request #51112 from s0undt3ch/2018.3 
[2018.3] Update to salt-bootstrap v2019.01.08
 2019-01-15 09:42:08 -07:00
Daniel Wozniak
4a12c5fa91
Merge pull request #50852 from mirceaulinic/fix-capirca 
Improve the Capirca and related modules for ACL config generation
 2019-01-15 09:41:00 -07:00
Daniel Wozniak
3f4759b8bf
Merge pull request #50923 from astronouth7303/patch-2 
Document {% include %}
 2019-01-15 09:39:11 -07:00
Daniel Wozniak
b19c990a16
Merge pull request #51097 from terminalmage/fix-keyerror-raise 
Fix improper exception raises (2018.3)
 2019-01-15 09:38:24 -07:00
Daniel Wozniak
8920a86f2c
Merge pull request #51169 from twangboy/fix_git_state 
More descriptive error when missing GitPython or PyGit2
 2019-01-15 09:37:43 -07:00