Commit Graph

964 Commits

Author SHA1 Message Date
Nicole Thomas
ece4452953
Merge pull request #45078 from aphor/macports
update macports doc, portfile
2018-02-15 14:17:33 -05: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
twangboy
91d343d744
Update to NSIS 3.02.1 2017-12-20 15:56:05 -07:00
twangboy
c28b7d4710
Roll back pyzmq req to 16.0.3 2017-12-20 15:41:56 -07:00
twangboy
42607982cb
Update docs for new support
Fix some types in the help for the installer
2017-12-19 11:10:05 -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
twangboy
ff06d5fdb1
Add ability to pass custom config
- Adds `/custom-config=` switch where you can pass the name of the
custom config file that resides in the same directory as the installer
or the full path to a custom config in another location
- Changes from using `/use-existing-config` to `/default-config` since
existing config is default anyway
- If you pass a minion or master setting, the default is to use the
default config
- Passing minion or master settins will modify the default config or the
custom config
- Changed from using a checkbox to denote existing config to a drop down
box to denote the type of config to use. Options are `Default Config`,
`Existing Config`, and `Custom Config`
- `Existing Config` is only added to the drop down if an existing config
is found on the system.
- Adds a file picker to the config dialog that allows you to browse to
the custom config. The file picker is only displayed when the config
type is `Custom Config`
- Improves the writing of multimaster settings to the default or custom
config. If multimaster is configured in the custom config and the user
passes multiple master settings those settings are written properly
- If there is an existing config and the config type is NOT `Existing
Config`, the existing config is backed up (given the .bak extension)
instead of deleted. This includes the `minion.d` directory.
- If "/custom-config` is passed from the command line but the specified
file does not exist, the installer just ends instead of uninstalling
salt. (This is for Silent installations)
- If the Config Specified in the GUI does not exist, the installer will
not continue until a valid file is specified.
- Changes the `/passive` switch in the vcredist installation to `/quiet`
for installation on headless systems.
2017-12-19 10:28:52 -07:00
Jeremy McMillan
d1bc6fc3f9
Merge branch 'develop' into macports 2017-12-18 21:31:09 -06:00
Jeremy McMillan
1e9e70720f
update macports doc, portfile 2017-12-18 21:09:54 -06: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
Nicole Thomas
0bc784867a
Merge pull request #45040 from dijit/patch-1
Installation Fails on headless machines.
2017-12-18 13:20:20 -05:00
Jan Harasym
c52a89d39a
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-15 18:42:35 +01:00
Nicole Thomas
353bb95720
Merge pull request #44874 from mcalmer/fix-suse-logdir-permissions
older logrotate need su directive
2017-12-12 14:31:24 -05:00
Nicole Thomas
6a3162858f
Merge pull request #44862 from twangboy/win_update_build
Update build scripts for Oxygen
2017-12-11 10:46:51 -05:00
twangboy
04c00827f1 Remove check for sudo 2017-12-07 17:31:31 -07:00
twangboy
b9f2863b60 Improvements to build scripts
Upgrade dependencies where available
Downloaded:
- libsodium to 1.0.15
- OpenSSL to 1.0.2n
- Python to 2.7.14
Pip:
- apache-libcloud to 2.2.1
- cffi to 1.11.2
- CherryPy to 13.0.0
- GitPython to 2.1.7
- idna to 2.6
- Jinja2 to 2.9.6
- pyasn1 to 0.4.2
- pyzmq to 17.0.0b3
- requests to 2.18.4
- six to 1.11.0
- tornado to 4.5.2
- cryptography to 2.1.4
- pyOpenSSL to 17.5.0
Update shasums for downloaded updates
Make the scripts self sudo themselves
Since we're forcing the script to run as sudo, remove individual sudo
calls
Move /opt/salt into variable $INSTALL_DIR in the build_env script
2017-12-07 17:21:36 -07:00
Michael Calmer
2b49a206bb older logrotate need su directive 2017-12-07 17:31:48 +01:00
twangboy
041d6f7568
Roll back futures to 3.1.1 for py3 compat 2017-12-06 17:42:20 -07:00
twangboy
7ed11349b7
Remove CherryPy dependency 2017-12-06 17:09:38 -07:00
twangboy
8934d7fc41
Remove postinstall script, just do it in powershell 2017-12-06 15:47:37 -07:00