Super-User
26eb35f99d
fixes salt/salt-bootstrap#1021
2017-01-26 21:22:34 +01:00
twangboy
214e1cc598
Fix 64bit detection, vcredist only on <= 2008
2017-01-24 11:56:11 -07:00
twangboy
62e608b627
Update Jinja2 to 2.9.4
2017-01-24 09:44:23 -07:00
Nicole Thomas
1262fa8ef8
Merge pull request #38843 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-01-20 14:01:12 -07:00
Mike Place
12118fa4eb
Merge pull request #38794 from markuskramerIgitt/develop
...
Test availability of git in the command shell.
2017-01-20 13:43:40 -07:00
rallytime
3f74d697b9
Merge branch '2016.11' into 'develop'
...
Conflicts:
- pkg/windows/build_pkg.bat
- salt/modules/archive.py
2017-01-20 12:07:19 -07:00
Mike Place
10a3d8b8dd
Merge pull request #38726 from twangboy/vcredist
...
Add VC Redist 2008 SP1 MFC to installer
2017-01-19 12:13:41 -07:00
Bo Maryniuk
eb25e2f768
Add a salt-minion service control file
2017-01-18 15:38:53 +01:00
markuskramerIgitt
b25542a66d
Version must be set
2017-01-18 02:09:04 +01:00
twangboy
f00a65355d
change extensions .ext to .exe
2017-01-17 17:55:18 -07:00
markuskramerIgitt
559bee31f9
no pause
2017-01-17 23:02:10 +01:00
markuskramerIgitt
a789241c0c
Add test for git, omit cls to show result of tests.
2017-01-17 22:58:21 +01:00
rallytime
5b43a252c9
Merge branch '2016.11' into 'develop'
...
Conflicts:
- conf/master
- doc/topics/installation/ubuntu.rst
- salt/modules/pillar.py
- salt/netapi/rest_tornado/saltnado.py
- salt/states/influxdb_user.py
- salt/utils/minions.py
- salt/utils/openstack/nova.py
2017-01-17 09:50:06 -07:00
rallytime
30e8a66fb0
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/netapi/rest_tornado/saltnado.py
- tests/integration/netapi/rest_tornado/test_app.py
2017-01-16 18:54:14 -07:00
twangboy
98c40e278c
Add VC Redist 2008 SP1 MFC to installer
2017-01-13 12:42:39 -07:00
twangboy
e0c7e5549b
Update jinja2 to 2.9.4
2017-01-11 11:10:46 -07:00
rallytime
9ad362fbde
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/states/kapacitor.py
2017-01-03 10:17:18 -05:00
twangboy
e96bfe8fa2
Change OSX/OS X to macOS where possible
2016-12-28 14:49:46 -07:00
rallytime
a2927226ea
Merge branch '2016.11' into 'develop'
...
Conflicts:
- doc/ref/modules/all/salt.modules.napalm_route.rst
- doc/ref/modules/all/salt.modules.napalm_snmp.rst
- doc/ref/modules/all/salt.modules.napalm_users.rst
- doc/ref/states/all/salt.states.netsnmp.rst
- doc/ref/states/all/salt.states.netusers.rst
- salt/states/cron.py
2016-12-22 12:15:06 -07:00
rallytime
efb8a8ddf5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- doc/ref/configuration/minion.rst
- salt/config/__init__.py
- salt/minion.py
2016-12-22 10:39:14 -07:00
Michael Calmer
de6ec05ec0
add try-restart to fix autorestarting on SUSE systems
2016-12-21 10:31:18 +00:00
rallytime
494a06bee2
Merge branch '2016.11' into 'develop'
...
Conflicts:
- doc/ref/configuration/minion.rst
2016-12-20 10:03:44 -07:00
Denys Havrysh
c94e798b8a
SysV init script for rpm: get and show unique PIDs only
2016-12-14 12:31:42 +02:00
Denys Havrysh
8ff68c4128
Fix initscript for RHEL5 (SysV) to pick up proper python version
2016-11-29 16:23:48 +02:00
Mike Place
468dea6c42
Merge pull request #37858 from cournape/installers/osx/support-maverick
...
FEAT: put back support for Maverick in OS X installer.
2016-11-27 12:54:05 +02:00
David Cournapeau
dcc52ba08a
BUG: fix copypasta in preinstall script.
2016-11-24 14:53:04 +00:00
David Cournapeau
6c55e1e7fa
Revert "REF: use a variable to reference the pre/post install script output on OS X installer."
...
This reverts commit 7180e5ec21
.
2016-11-24 14:52:03 +00:00
Sergey Kizunov
334535bbd3
Make build_pkg.bat work with Python 3.6/3.5/2.7
...
Make `build_pkg.bat` and associated utility `portable.py`
compatible with Python 3.6, 3.5, and 2.7.
Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-11-23 14:24:55 -06:00
David Cournapeau
7180e5ec21
REF: use a variable to reference the pre/post install script output on OS X installer.
2016-11-23 11:48:18 +00:00
David Cournapeau
4265da7b53
BUG: use -w option when unloading salt minion launchd script.
2016-11-23 11:39:30 +00:00
David Cournapeau
8c7a88040f
TYPO: fix typo in debug postinstall message in OSX installer.
2016-11-23 11:38:25 +00:00
David Cournapeau
0e8cf75680
FEAT: put back support for Maverick in OS X installer.
...
As launchctl CLI interface changed on Yosemite, we execute the more
recent code for Yosemite and later, and introduced back the old code for
post/pre install scripts when running on Maverick.
Tested on Maverick (10.9.5).
2016-11-23 11:34:42 +00:00
markuskramerIgitt
d594b19cc9
superceded with clean_env.bat
2016-11-18 03:19:12 +01:00
rallytime
5f4a73f880
Merge branch '2016.11' into 'develop'
...
No conflicts.
2016-11-16 08:55:22 -07:00
twangboy
08200d2ee8
Update pyzmq to version 16.0.1
2016-11-14 17:12:59 -07:00
twangboy
cf55342150
Update pyzmq to version 15.3.0
2016-11-14 17:11:20 -07:00
rallytime
7b2341bbfd
Merge branch '2016.11' into 'develop'
...
Conflicts:
- doc/topics/releases/releasecandidate.rst
- salt/modules/file.py
- salt/states/file.py
- salt/utils/network.py
2016-11-10 15:59:51 -07:00
rallytime
3b56f8bce1
Merge branch '2016.3' into 'carbon'
...
Conflicts:
- doc/topics/event/master_events.rst
2016-11-07 08:13:57 -07:00
Michael Calmer
1fb2c4dfcf
fix status handling in sysv init scripts
2016-11-06 18:49:12 +01:00
rallytime
9b3e4414c8
Merge branch '2016.3' into 'carbon'
...
Conflicts:
- pkg/windows/modules/get-settings.psm1
- salt/modules/mac_power.py
- salt/modules/win_dsc.py
- salt/modules/win_servermanager.py
- salt/states/file.py
- salt/utils/event.py
- salt/utils/gitfs.py
2016-11-04 15:23:49 -06:00
Mike Place
edbfadca21
Merge pull request #37442 from twangboy/fix_osx_postinstall
...
Create paths.d directory
2016-11-04 17:07:19 +13:00
twangboy
2de69f48f8
Detect VC for Python correctly on 32bit Windows
2016-11-03 18:23:19 +00:00
twangboy
8091a3065e
Create paths.d directory
2016-11-03 09:27:50 -06:00
rallytime
70851807bd
Merge branch 'carbon' into 'develop'
...
Conflicts:
- salt/modules/status.py
2016-10-24 09:35:00 -06:00
Mike Place
3a3838eed9
Merge pull request #37166 from aphor/macports
...
upgrade macports salt to v2016.11
2016-10-24 11:41:18 +09:00
Jeremy McMillan
3cdddcbc87
upgrade macports salt to v2016.11
2016-10-22 11:04:50 -05:00
rallytime
caa8fc9169
Merge branch '2016.3' into 'carbon'
...
Conflicts:
- pkg/deb/salt-api.service
- pkg/deb/salt-master.service
- salt/client/__init__.py
- salt/fileclient.py
- salt/modules/cp.py
- salt/modules/status.py
- tests/integration/__init__.py
- tests/integration/modules/cp.py
2016-10-21 15:50:03 -06:00
Erik Johnson
fb6e545f78
Use NotifyAccess=all in all unit files
...
When systemd-python is not installed, systemd notification falls back to
using the systemd-notify for service notification. This cannot be used
however unless the unit has NotifyAccess=all set.
The particular use case for this is when Salt is installed using pip. We
don't put systemd-python into the requirements.txt because we can't be
sure that the minion supports systemd, so pip installs won't necessarily
have systemd-python available.
2016-10-19 12:50:30 -05:00
Erik Johnson
0ccf789172
Remove EnvironmentFile and Restart lines from unit files
...
These shouldn't be there, because the variables sourced by the
EnvironmentFile are only made available to the Exec commands in the unit
file.
2016-10-07 12:33:04 -05:00
Erik Johnson
ddd44e9b13
Use Type=notify for debian systemd units
2016-10-06 09:14:50 -05:00
Robert James Hernandez
036d73f31b
Use control-group default for killmode
2016-10-05 10:49:37 -07:00
Mike Place
34007be671
Merge branch 'carbon' into carbon_develop
2016-10-06 00:23:22 +09:00
twangboy
9afed88ed0
Update docs, change final dialog
2016-10-04 16:14:13 -06:00
twangboy
b3083cb139
Add delayed start option to minion service
2016-10-04 14:18:42 -06:00
twangboy
2d697b30c6
Add lxml to deps for Windows (used by win_lgpo)
2016-10-03 17:35:11 -06:00
Mike Place
7b43d4322c
Merge branch '2016.3' into 2016_3_carbon
2016-09-27 16:44:42 +09:00
twangboy
5fc63a1054
Add pyOpenSSL to req file for Windows
2016-09-26 17:35:28 -06:00
twangboy
3baeb2974d
Add Estimated Size for Add/Remove Programs
2016-08-24 18:11:49 +00:00
twangboy
2ef1e00888
Add master build package build
2016-08-23 22:41:18 +00:00
twangboy
a3495d0852
Add minion only script
2016-08-23 22:37:17 +00:00
rallytime
b80ef26cf2
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/cli/batch.py
- salt/minion.py
- salt/modules/cassandra_cql.py
- salt/modules/rsync.py
2016-08-23 10:44:55 -06:00
twangboy
3d6d473d48
Revert to vcredist 12 (2013)
2016-08-22 17:57:14 -06:00
twangboy
10af191a4d
Revert to vcredist 12 (2013)
2016-08-22 17:38:50 -06:00
Mike Place
1fb2c03e88
Merge pull request #35474 from twangboy/fix_windows_installer
...
Hide minion config page, add master config file
2016-08-20 12:11:37 +09:00
rallytime
00dff9dcbd
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-08-18 14:44:12 -06:00
Erik Johnson
6cb0fb47f3
pkg/salt-syndic.service: change Type to notify
2016-08-18 14:45:46 -05:00
Erik Johnson
175ba99e0e
pkg/salt-minion.service: remove KillMode, change Type to notify
2016-08-18 14:44:51 -05:00
Erik Johnson
540ec28954
pkg/salt-master.service: remove KillMode
2016-08-18 14:44:19 -05:00
Erik Johnson
69fad464ab
pkg/salt-api.service: change Type to notify
2016-08-18 14:43:50 -05:00
rallytime
d2340a0aad
Merge branch '2016.3' into 'develop'
...
Conflicts:
- pkg/windows/build.bat
- pkg/windows/build_pkg.bat
- tests/runtests.py
2016-08-17 12:13:26 -06:00
Nicole Thomas
e86a39a115
Merge pull request #35516 from rallytime/bp-34441
...
Back-port #34441 to 2016.3
2016-08-17 09:47:23 -06:00
markuskramerIgitt
32da48df08
setup.py will not print each individual file
2016-08-17 08:35:44 -06:00
markuskramerIgitt
698a076a39
Completely remove Python and verify
2016-08-17 08:35:44 -06:00
markuskramerIgitt
7406bd22a6
Errors will stop the scripts
2016-08-17 08:35:44 -06:00
markuskramerIgitt
e47c661cb0
Copy and delete silently, do not list each file
2016-08-17 08:34:06 -06:00
twangboy
c20803de07
Hide minion config page, add master config file
2016-08-15 22:53:27 +00:00
twangboy
d120a8906f
Add vcredist 14 dlls
2016-08-10 18:56:08 +00:00
twangboy
00eff0a1a8
Fix architecture detection
2016-08-09 21:26:57 +00:00
twangboy
153b674fc5
Detect 32/64 bit installation
2016-08-09 21:09:36 +00:00
twangboy
23fbc7890c
Fix previous version detection
2016-08-09 20:57:33 +00:00
twangboy
e661540526
Fix VC Compiler detection for 32bit Windows
2016-08-09 20:44:47 +00:00
twangboy
978775714b
More standardization
2016-08-09 20:11:45 +00:00
twangboy
5787e27af1
Standardize build scripts
2016-08-09 19:53:55 +00:00
twangboy
99ac8acce6
Add path to Python Scripts to build.bat
2016-08-09 19:27:28 +00:00
twangboy
4f78bb0f34
Add path, fix uninstaller
2016-08-09 18:58:58 +00:00
twangboy
8e056168a4
Add function for adding to the path
2016-08-09 17:23:49 +00:00
twangboy
418e649be7
Fix App Paths entries
2016-08-09 17:23:49 +00:00
twangboy
d453199b56
Fix services not starting correctly, use nsExec
2016-08-09 17:23:48 +00:00
twangboy
cc88e50a42
Add Salt-Master to installer
2016-08-09 17:23:47 +00:00
twangboy
9218278873
Fix Title/Subtitle on Minion Config page
2016-08-09 17:23:47 +00:00
twangboy
a860580c79
Change GUID for python 2.7.12
2016-08-09 17:23:47 +00:00
twangboy
31ffb8f6e5
Add dependency dlls to script
2016-08-09 17:23:46 +00:00
twangboy
4149f0c237
Update pip requirements
2016-08-09 17:23:46 +00:00
Shane Lee
17a3b23ff8
Use Python 2.7.12 for Windows Build ( #34468 )
2016-07-06 17:29:50 -04:00
Shane Lee
858e5c1772
Update Python to 2.7.12 for Mac ( #34493 )
2016-07-06 17:10:53 -04:00
Thayne Harbaugh
aab8e23975
Minor tweaks/improvements to the salt-minion SysV init script.
...
* Test "reload" before probing minion configuration
* change indent
2016-07-28 12:12:45 -06:00
Benedikt Heine
5c45ac10e3
[bash-completion] remove old comment
2016-07-26 23:56:56 +02:00
Benedikt Heine
db58e62b0d
[bash-completion] split modules and functions completion
...
change behavior to complete modules and functions separately. This helps
gaining overview during completion.
2016-07-26 23:56:56 +02:00
Benedikt Heine
99871f4c33
[bash-completion] cache function completions
...
Cache the function completions. This may be neccessary if timeout is too
high and therefore you may get stuck on your input line.
2016-07-26 23:56:56 +02:00
Mike Place
b29d3c95a8
Merge pull request #34932 from bebehei/fix-hide-timeout
...
[bash-completion] hide timeout in salt-output
2016-07-26 11:18:59 -06:00