valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
92,126 Commits 24 Branches 182 Tags 341 MiB
fd9bc06aab
Commit Graph

978 Commits

Author SHA1 Message Date
twangboy
5549d83aae
Use ssm instead of nssm 2018-04-25 23:14:28 +00:00
rallytime
4718d31e53
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - salt/config/__init__.py
  - salt/minion.py
  - salt/modules/pip.py
  - salt/states/pip_state.py
  - salt/states/virtualenv_mod.py
  - tests/integration/modules/test_status.py
 2018-04-19 17:15:20 -04:00
twangboy
990a24d7ed
Fix build_env scripts 
Uses `cmd /c` when launching commands to avoid the hang when installing
python 3
`clean_env.bat` will uninstall Py2 and Py3 in a single run
 2018-04-12 11:26:40 -06:00
rallytime
2f1cf3e511
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
 2018-04-10 10:11:35 -04:00
Daniel Wallace
b9efec8526
remove libnacl on windows 
We do not use raet on windows, so we don't need to install it
 2018-04-04 13:37:40 -05:00
rallytime
e75ba1f502
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - doc/topics/releases/2018.3.0.rst
 2018-04-03 10:27:23 -04:00
twangboy
5eed1682cb
Use 17.0.0 instead of the beta (17.0.0b3) 2018-03-28 12:40:37 -06:00
twangboy
1403e29d97
Rollback pyzmq to version 16.0.3 2018-03-28 12:24:08 -06:00
rallytime
e312efb5e7
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/modules/cmdmod.py
  - salt/modules/pillar.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/pkg/rpm.py
  - salt/utils/schedule.py
  - tests/integration/states/test_npm.py
  - tests/integration/states/test_pkgrepo.py
 2018-03-27 16:31:55 -04:00
rallytime
00d4eb26f3
Merge branch '2018.3.0rc1' into '2018.3' 
Conflicts:
  - pkg/windows/req.txt
 2018-03-27 11:41:56 -04:00
twangboy
77439948cc
Bring #46310 into 2018.3.0rc1 2018-03-22 13:27:14 -06:00
twangboy
fa0b0efe46
Fix some installer script inconsistencies 2018-03-20 09:54:36 -06:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
Nicole Thomas
4c8d9026d3
Merge pull request #46428 from twangboy/win_fix_reqs 
Fix issue with dev env install on Windows
 2018-03-09 09:52:45 -05:00
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 15:25:42 +01:00
twangboy
e7ab97cc17
Remove six as a hard dep for Salt 2018-03-07 12:26:37 -07:00
twangboy
cc67e5c2ef
Set six to 1.11.0 
CherryPy has a requisite of six>=1.11.0 and salt had a requisite of
six==1.10.0 which was causing a problem in the dev environment
 2018-03-07 11:52:17 -07:00
twangboy
bcf8b19566
Update the installer build 
Fixes some issues with Py3 not building
Brings the 2 build_env files more in line with each other
Fixes some typos in the build_env scripts
Removes the need for seperate req files for Py2 and Py3
Setup.py uses the windows req file on Windows
Removes the need to install pycrypto and pyyaml in setup.py. They are
now handled in the req.txt
Uses pypi resources instead of downloading .whl files and .exes for
dependencies
Updates nssm version to address the issue in #46192
Removes nssm from buildenv and downloads 32 and 64 bit versions of nssm
in build_pkg.bat
Removes the AppNoConsole=1 setting from the nsis script since it is not
needed with the new version of nssm
 2018-03-02 13:04:48 -07:00
rallytime
ca1f8a3b59
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/modules/gnomedesktop.py
  - salt/utils/cloud.py
 2018-01-29 12:51:36 -05:00
Nicole Thomas
9fb4d4a528
Merge pull request #45688 from bdrung/raise-max-open-files 
Raise LimitNOFILE to default max open files
 2018-01-29 09:26:56 -05:00
rallytime
0ad101d560
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - doc/man/salt.7
  - salt/modules/git.py
  - salt/modules/pacman.py
  - salt/states/git.py
  - tests/integration/modules/test_mac_user.py
  - tests/support/parser/__init__.py
 2018-01-26 17:27:03 -05:00
rallytime
8e3a2e25fe
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/modules/git.py
 2018-01-26 15:17:56 -05:00
Benjamin Drung
bbedeec756 Raise LimitNOFILE to default max open files 
The configuration option max_open_files defaults to 100,000, but the
salt-master service is only started with a limit of 16,384 open files.
Therefore the higher limit cannot be applied and there will be a log
message:

Current values for max open files soft/hard setting: 16384/16384
The value for the 'max_open_files' setting, 100000, is higher than what
the user running salt is allowed to raise to, 16384. Defaulting to
16384.

This is related to #40173.
 2018-01-25 16:17:48 +01:00
twangboy
52d6d78150
Only keep ssh.py in the Windows installer 2018-01-17 14:00:10 -07:00
twangboy
54eb0db2c4
Keep ssh state and execution modules in the installer 2018-01-17 13:49:39 -07:00
rallytime
60370f5fb6
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/daemons/masterapi.py
  - salt/proxy/dummy.py
  - salt/states/file.py
  - tests/integration/modules/test_state.py
  - tests/integration/runners/test_runner_returns.py
  - tests/integration/ssh/test_state.py
  - tests/support/parser/__init__.py
  - tests/unit/grains/test_core.py
  - tests/unit/states/test_file.py
 2018-01-11 16:00:08 -05:00
Johannes Renner
530ddd2d29
Set SHELL environment variable 
When passing a ProxyCommand option to salt-ssh a valid $SHELL is needed to execute the given command.
 2018-01-11 13:37:38 +01:00
Nicole Thomas
888557c8c8
Merge pull request #45304 from twangboy/win_add_pythonnet 
Add pythonnet dependency for Windows
 2018-01-09 16:32:17 -05:00
Nicole Thomas
bf38bdca6c
Merge pull request #45280 from rallytime/merge-oxygen 
[oxygen] Merge forward from 2017.7 to oxygen
 2018-01-09 15:37:52 -05:00
twangboy
2c47d03150
Add pythonnet dependency for Windows 2018-01-05 13:44:30 -07:00
twangboy
187a420327
Copy not move dlls for PY2 2018-01-04 17:15:00 -07:00
twangboy
8c732b5294
Put dlls in both places for Py2 and Py3 2018-01-04 16:40:43 -07:00
twangboy
2d636266e8
Put dlls in right place for py2 and py3 
Py2 dlls go in site-packages\win32
Py3 dlls go in site-packages\win32 and the root of python
 2018-01-04 15:59:04 -07:00
rallytime
59076f5ee8
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/client/ssh/wrapper/state.py
  - salt/modules/yumpkg.py
 2018-01-04 17:45:29 -05:00
Nicole Thomas
ff9880c498
Merge pull request #45255 from rallytime/bp-44427 
Back-port #44427 to 2017.7
 2018-01-04 16:46:16 -05:00
twangboy
15317951fc
Update setup.py for new windows install 
setup.py
- Remove PyCrypto install, that happens through req.txt
- Remove PyYAML install, that happens through req.txt
- Add PyWin32 install, that happens with downloaded .whl
- Detect if PyWin32 is already installed before installing

build_env_#.py
- Put PyWin32 dlls in Python root instead of site-packages\win32
- hide gen_py directory creation message
 2018-01-03 14:28:36 -07:00
Volodymyr Samodid
6ceafbbf3a
use KillMode=process for salt-minion.service 2018-01-03 14:38:23 -05:00
twangboy
e3a8279c01
Get path to python binary based on executable 2018-01-03 10:19:09 -07:00
Nicole Thomas
83452f78c8
Merge pull request #45246 from twangboy/win_fix_installer_typos 
Fix a few minor typos in the installer script
 2018-01-03 08:48:31 -05:00
twangboy
1f2658bbeb
Fix a few minor typos in the installer script 2018-01-02 15:49:35 -07:00
twangboy
12e9d13b21
Roll cffi dep back to version 1.10.0 2018-01-02 15:30:24 -07:00
twangboy
03aec37040
Fix search/replace in Py3 2018-01-02 15:22:58 -07:00
twangboy
afd95fa821
Add libnacl dependency 2017-12-27 13:43:23 -07:00
twangboy
b46845888d
Add libnacl dependency 2017-12-27 13:40:49 -07:00
Nicole Thomas
b0a23548f3
Merge pull request #45088 from twangboy/win_custom_config 
Add `/custom-config` switch to Windows installer
 2017-12-22 10:19:59 -05:00
rallytime
9ded5e1cbb
Merge branch '2017.7' into 'oxygen' 
Conflicts:
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/modules/win_lgpo.py
  - salt/returners/mysql.py
  - salt/states/libcloud_dns.py
  - tests/integration/runners/test_runner_returns.py
  - tests/unit/grains/test_core.py
 2017-12-21 15:58:08 -05:00
Nicole Thomas
7dd4255ab4
Merge pull request #45115 from twangboy/win_fix_pyzmq 
Set pyzmq version to 16.0.3
 2017-12-21 09:36:16 -05:00
twangboy
50b247a001
Update docs and help 2017-12-20 19:43:26 -07:00
twangboy
b6cecedbf6
Add timestamp to backup 2017-12-20 19:14:47 -07:00