valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,693 Commits 24 Branches 182 Tags 341 MiB
d4e26aceda
Commit Graph

904 Commits

Author SHA1 Message Date
Daniel A Wozniak
566a4ea66a
Install the launcher so we can execute py files 2018-08-13 16:21:59 -07:00
twangboy
e30d17099d
Use goto instead of if statement 2018-07-17 18:23:34 -06:00
twangboy
e1042fa084
Remove vcredist for Py3 2018-07-17 16:28:01 -06:00
twangboy
361b3cdc2f
Rollback python-certifi-win32 
It's causing issues with the test suite on Windows
 2018-07-11 10:33:39 -06:00
twangboy
b0087d425c
Add license info 2018-07-06 15:55:14 -06:00
twangboy
935f9b560c
Fix dependencies 
Adds back libnacl
Adds back libsodium.dll
Adds new python-certifi-win32
 2018-07-06 15:46:57 -06:00
twangboy
59ae2cc5fc
Use --disable-pip-version-check for build_env_#.ps1 2018-06-18 13:15:03 -06:00
twangboy
66d8b0331a
Add sign.bat script for signing packages 2018-05-23 11:20:51 -06:00
twangboy
9d498293b1
Remove unused settings, update NSIS 2018-05-03 16:46:03 -06: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
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
twangboy
fa0b0efe46
Fix some installer script inconsistencies 2018-03-20 09:54:36 -06: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
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
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
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
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
ff9880c498
Merge pull request #45255 from rallytime/bp-44427 
Back-port #44427 to 2017.7
 2018-01-04 16:46:16 -05: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
twangboy
03aec37040
Fix search/replace in Py3 2018-01-02 15:22:58 -07:00
twangboy
b46845888d
Add libnacl dependency 2017-12-27 13:40:49 -07:00
rallytime
4f21a2bbfd
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/installer/Salt-Minion-Setup.nsi
  - salt/runners/manage.py
 2017-12-19 12:57:51 -05:00
Jan Harasym
aa438e1605
Installation Fails on headless machines. 
Installation fails on headless machines if `/passive` is set, `/passive` will display an installation progress bar on windows desktop. `/quiet` suppresses the GUI and does not fail when there is no desktop session available. Fixes #45036.
 2017-12-18 13:56:58 -05:00
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.2.rst
 2017-10-16 13:53:13 -04:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-10-10 16:34:52 -04:00
apapp
87d676f08a
add -n with netstat so we don't resolve 2017-10-03 13:32:30 -04:00
Daniel Wallace
f7df41fa94
split build and install for pkg osx 2017-09-26 12:59:23 -06:00
rallytime
a401166bd5 Merge branch '2017.7.2' into '2017.7' 
No conflicts.
 2017-09-21 09:52:38 -04:00
rallytime
57b9d642c2 Merge branch '2016.11.8' into '2016.11' 
No conflicts.
 2017-09-18 16:40:05 -04:00
twangboy
f33395f1ee Fix logic in /etc/paths.d/salt detection 2017-09-15 13:41:23 -06:00
twangboy
1b0a4d39d2 Fix logic in /etc/paths.d/salt detection 2017-09-15 13:37:53 -06:00
rallytime
4251ce5a27 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/windows/installer/Salt-Minion-Setup.nsi
  - salt/version.py
 2017-09-13 15:04:07 -04:00
twangboy
2d269d1a76 Change all comment markers to '#' 2017-09-12 12:59:57 -06:00
twangboy
6984b8fd60 Add /norestart to vcredist installer 2017-09-12 12:49:20 -06:00
twangboy
d80aea16cb Handle ErrorCodes returned by VCRedist installer 2017-09-12 11:56:17 -06:00
twangboy
fb31e9a530 Add /norestart switch to vcredist install 2017-09-12 10:05:36 -06:00
Pablo Suárez Hernández
be4f26ab21 Use $HOME to get the user home directory instead using '~' char 2017-09-11 20:23:25 +02:00
twangboy
9979ccb613 Remove Py2 and Py3 in the same run 2017-08-31 14:15:06 -06:00
twangboy
a5d9f85db6 Modifications to build scripts 
Py3 installs to c:\python35
Quote the path to the python install directory
Fix spellings in comments
Move pywin32 dlls to site-packages/win32 instead of python root
Remove pywin32 postinstall and testing scripts
Add passive switch to py3 uninstall
 2017-08-31 11:41:13 -06:00
rallytime
328dd6aa23 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - pkg/osx/pkg-scripts/postinstall
  - pkg/osx/pkg-scripts/preinstall
 2017-08-22 09:38:33 -04:00
twangboy
ef8a14cdf9 Remove /opt/salt instead of /opt/salt/bin 2017-08-18 12:19:04 -06:00
twangboy
2dd62aa1da Add more information to the description 2017-08-18 12:09:08 -06:00
twangboy
f44f5b70dc Only stop services if they are running 
Otherwise it will cause an error and the installation will fail
 2017-08-18 11:52:34 -06:00