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
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
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
rallytime
12a75c1108
Merge branch '2016.11' into 'nitrogen'
...
No conflicts.
2017-05-10 15:32:23 -06:00
twangboy
96918dcfa6
Add silent action to MsgBox for Path Actions
2017-05-10 11:22:18 -06:00
rallytime
f552dd63f3
Merge branch '2016.11' into 'nitrogen'
...
Conflicts:
- pkg/windows/installer/Salt-Minion-Setup.nsi
- tests/unit/states/test_tomcat.py
2017-04-14 10:46:56 -06:00
twangboy
b6ac4aa86d
Fix service for win10 update
2017-04-13 13:51:15 -06:00
twangboy
90e5022e82
Fix nsis script error
2017-03-31 15:12:41 -06:00
twangboy
02757db1e4
Add python 3 installer for Windows
2017-03-10 21:52:38 +00:00
rallytime
dda39d4e63
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/minion.py
- salt/modules/file.py
- salt/modules/grains.py
- salt/utils/gitfs.py
2017-02-16 12:18:46 -07:00
twangboy
ef5078729a
Capitalize the 'r' for 2008R2
2017-02-09 09:55:59 -07:00
twangboy
1b6bd634ac
Require VCRedist on 2008R2 and below instead of 2008
2017-02-09 09:47:47 -07:00
rallytime
e91fcbeaac
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/minion.py
- salt/modules/dockerng.py
- salt/thorium/key.py
2017-01-26 16:02:06 -07:00
twangboy
214e1cc598
Fix 64bit detection, vcredist only on <= 2008
2017-01-24 11:56:11 -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
twangboy
98c40e278c
Add VC Redist 2008 SP1 MFC to installer
2017-01-13 12:42:39 -07: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
3baeb2974d
Add Estimated Size for Add/Remove Programs
2016-08-24 18:11:49 +00:00
twangboy
a3495d0852
Add minion only script
2016-08-23 22:37:17 +00:00
twangboy
c20803de07
Hide minion config page, add master config file
2016-08-15 22:53:27 +00:00
twangboy
23fbc7890c
Fix previous version detection
2016-08-09 20:57:33 +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
markuskramerIgitt
994d1a3e6a
Added description to nsi salt-minion service.
2016-06-22 16:37:55 +02:00
Shane Lee
38e82fb89e
Always make changes to minion config if set ( #34022 )
2016-06-15 12:53:19 -04:00
twangboy
b7fcae97ce
Create minion.d directory, fixes #31976
2016-03-29 14:17:24 -06:00
twangboy
4af8c9dbfc
Back port nullsoft build script from 2015.8
2016-03-16 17:57:04 -06:00
twangboy
a0c5223554
Fixes #27923 and #28000
...
Fixed a bug where the installer wouldn't grab current config if the salt
service was stopped
Added a switch to start the salt service at the end
Switch works with both silent and GUI installs
/start-service=1 will start the service
/start-service=0 will not start the service
Default is to start the service
2015-10-27 15:43:22 -06:00
twangboy
e61eeba48b
Fixed problem with service not starting
2015-07-08 22:23:45 +00:00
twangboy
cc50218b01
Start Minion Service on Silent Install
2015-06-09 09:34:41 -06:00
twangboy
038331edab
Fixed checkbox for starting service and actually starting it
2015-05-12 18:04:42 +00:00
salt_build
3f180cfaae
Added ability to send a version with a space in it
2015-04-20 21:55:57 +00:00
salt_build
4d25af8acf
Fixed version not showing in Add/Remove Programs
2015-04-16 22:43:51 +00:00
salt_build
6d99681b8d
Moved file deletion to happen after user clicks install
2015-04-08 18:25:56 +00:00
twangboy
51370ab2f9
Removed dialog box that was used for testing
2015-04-03 00:17:12 +00:00
twangboy
7377c503de
Add switches for passing version to nsi script
2015-04-03 00:13:58 +00:00
twangboy
41a96d4daa
Fixed hard coded version
2015-04-01 22:14:35 +00:00
twangboy
82b2f3e637
Removed message_box i left in for testing
...
I'm an idiot
2015-04-01 22:11:08 +00:00
twangboy
8615e8d403
Fixed problem with nested directories
2015-03-31 17:26:46 -06:00
twangboy
de85a03add
Pull minion config settings from minion conf
2015-03-28 00:14:01 +00:00
Shane Lee
2605223e44
Update Salt-Minion-Setup.nsi
2015-03-26 07:03:51 -06:00
Shane Lee
9579bb2a8d
Update Salt-Minion-Setup.nsi
2015-03-26 07:02:16 -06:00
