rallytime
a401166bd5
Merge branch '2017.7.2' into '2017.7'
...
No conflicts.
2017-09-21 09:52:38 -04:00
twangboy
f33395f1ee
Fix logic in /etc/paths.d/salt detection
2017-09-15 13:41:23 -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
twangboy
3b62bf953c
Remove salt from the path
2017-08-18 11:44:35 -06:00
twangboy
ebdca3a0f5
Update pkg-scripts
...
Improves logging
Removes /opt/salt/bin directory before install
Removes symlink to salt-config before install
2017-08-18 11:25:32 -06:00
twangboy
ffb23fbe47
Remove the line that wipes out the cache
2017-08-14 12:26:27 -06:00
twangboy
a3becf8342
Change service shutdown timeouts
...
Windows default for stopping a service is 30 seconds. This changes the
default timeouts for the salt-minion service to more closely resemble
how it is handled in Windows. This gives Python a chance to cleanly exit
before being forcibly closed.
2017-08-14 11:19:09 -06:00
twangboy
28053a84a6
Change GitPython version to 2.1.1
...
Version 2.1.4+ requires git to be installed, usually in the form of xcode
command line tools. 2.1.3 has a memory leak problem, 2.1.2 is not
available. So that leaves 2.1.1.
2017-08-10 17:39:58 -06:00
twangboy
8604312a7b
Remove master conf in minion install
2017-08-02 17:12:02 -06:00
rallytime
36a1bcf8c5
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- salt/modules/win_wua.py
- salt/utils/schedule.py
- tests/unit/modules/rabbitmq_test.py
2017-07-27 14:00:15 -06:00
twangboy
69d5973651
Compile scripts with -E -s params for python
2017-07-26 16:36:25 -06:00
twangboy
d55a44dd1a
Avoid loading user site packages
2017-07-26 14:21:41 -06:00
twangboy
9af1eb2741
Ignore any PYTHON* environment vars already on the system
2017-07-26 13:42:12 -06:00
twangboy
4e2fb03a95
Add pythonpath to batch files and service
2017-07-26 12:21:14 -06:00
twangboy
ac0e04af72
Remove build and dist, sign pkgs
2017-07-20 10:59:24 -06:00
twangboy
9d66e273c4
Fix hard coded pip path
2017-07-20 10:37:08 -06:00
twangboy
7b8d6cbbd2
Add support for Py3
2017-07-19 17:30:47 -06:00
twangboy
aa4eed93c8
Update Python and other reqs
2017-07-19 11:22:07 -06:00
twangboy
a7c910c31e
Remove build and dist directories before install
2017-07-18 11:36:38 -06:00
twangboy
0946002713
Add blank line after delete
2017-07-18 11:28:49 -06:00
twangboy
f7c0bb4f46
Remove build and dist directories before install
2017-07-18 11:23:16 -06:00
Mike Place
41514b886e
Merge pull request #42096 from twangboy/win_use_default_configs
...
Use default salt configs for Windows installs
2017-07-03 17:03:26 -05:00
twangboy
c1e899c0ca
Create Master installer if script is found
2017-07-03 13:54:27 -06:00
twangboy
7da86b3540
Use default salt configs for Windows installs
2017-07-03 13:33:24 -06:00
twangboy
e4183a6d1c
Fix comments
2017-07-03 10:27:04 -06:00
twangboy
984b736e14
Add missing batch file
2017-07-03 10:24:10 -06:00
Pablo Suárez Hernández
30b12da58b
Enables salt-minion watchdog on init.d script for sysV
2017-06-20 17:28:40 +01:00
Michael Calmer
db295f6f06
special salt-minion.service file for rhel7
2017-06-20 17:28:39 +01:00
Silvio Moioli
22d884f478
Avoid failures on SLES 12 SP2 because of new systemd TaskMax limit (bsc#985112)
2017-06-20 17:28:39 +01:00
Michael Calmer
8c89378b0d
Run salt-api as user salt (bsc#990029)
2017-06-20 17:28:38 +01:00
Klaus Kämpf
0cf36b487b
Run salt master as dedicated salt user
...
* Minion runs always as a root
2017-06-20 17:13:00 +01:00
Klaus Kämpf
02b6d8ce42
tserong@suse.com -- We don't have python-systemd, so notify can't work
2017-06-20 17:09:14 +01:00
Mike Place
3cdd2fe96c
Merge pull request #41701 from twangboy/remove_win_unicode_console
...
Remove win_unicode_console dependency
2017-06-19 11:57:12 -05:00
twangboy
8b4e3ad77d
Upgrade psutil to version 5.2.2
2017-06-16 17:59:50 -06:00
rallytime
16a2747d7d
Merge branch '2016.11' into '2017.7'
...
Conflicts:
- pkg/windows/buildenv/salt.bat
- salt/modules/pillar.py
- salt/utils/openstack/nova.py
- tests/unit/cloud/clouds/test_dimensiondata.py
- tests/unit/cloud/clouds/test_gce.py
2017-06-14 13:31:42 -06:00
twangboy
0d4be0220b
Add batch files for master
2017-06-12 15:48:46 -06:00
Nicole Thomas
435d6189bf
Merge pull request #41446 from cloudflare/proxy-file
...
[backport] salt-proxy: Fix systemd unit file to handle more proxy names
2017-06-12 12:33:20 -06:00
twangboy
e8a24db927
Remove win_unicode_console dependency
2017-06-12 11:56:18 -06:00
rallytime
093f96f84e
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-06-08 16:45:34 -06:00
