valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,130 Commits 24 Branches 182 Tags 341 MiB
1dcf167bb7
Commit Graph

261 Commits

Author SHA1 Message Date
Craig Rodrigues
381e8cc144 Use print as a function [PEP 3105]. 
This reduces warnings from the 2to3 utility
and future proofs the code when it is time to move to Python 3.
 2015-12-04 16:17:35 -08:00
twangboy
90b19a3279 Fixed the script... something got broke... 2015-11-04 10:53:10 -07:00
Colton Myers
3286a5250f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/installation/windows.rst
    doc/topics/tutorials/pillar.rst
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/file.py
    salt/modules/schedule.py
    salt/pillar/git_pillar.py
    salt/states/boto_route53.py
    salt/states/pkg.py
    tests/integration/modules/pillar.py
 2015-10-30 16:05:26 -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
63a7305ae9 Uninstaller only removes specific files and dirs 
Fixes: #27032

Uninstaller only removes the following:
- ./bin
- salt*
- nssm.exe
- uninst.exe

All other files will remain untouched
 2015-09-24 14:59:32 -06:00
twangboy
7e35b13022 Turned multiprocessing on 2015-09-11 08:10:52 -06:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-07-14 10:57:36 -06:00
twangboy
e61eeba48b Fixed problem with service not starting 2015-07-08 22:23:45 +00:00
Colton Myers
725e5c689f Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 2015-06-11 13:15:38 -06:00
Colton Myers
e1d45ccf3b Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-06-10 12:02:42 -06:00
twangboy
673e1d809e Added missing panel.bmp for installer 2015-06-09 10:28:09 -06:00
twangboy
cc50218b01 Start Minion Service on Silent Install 2015-06-09 09:34:41 -06:00
Colton Myers
c4f5e231fa Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2 
Conflicts:
    doc/_themes/saltstack2/layout.html
    doc/conf.py
    doc/index.rst
    doc/ref/modules/all/salt.modules.hipchat.rst
    doc/topics/releases/index.rst
    salt/client/ssh/client.py
    salt/cloud/clouds/vsphere.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_route53.py
    salt/modules/data.py
    salt/modules/http.py
    salt/modules/tls.py
    salt/output/compact.py
    salt/states/boto_elb.py
    salt/states/linux_acl.py
    salt/states/rabbitmq_user.py
    salt/states/win_servermanager.py
    salt/utils/dictupdate.py
    salt/wheel/config.py
 2015-05-29 15:10:13 -06:00
Ben Woodward
6632d06e94 Unset PYTHONHOME when starting the service 
Means that installing Python on the system shouldn't break Salt
 2015-05-29 15:28:35 +01:00
Sergey Kizunov
714dc95159 Adding missing .bat scripts for salt-master and friends 
Adding:
- salt-key.bat
- salt-master.bat
- salt-run.bat
- salt.bat

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2015-05-15 20:14:32 -05:00
Colton Myers
bd635488ef Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-05-13 11:49:55 -06:00
twangboy
038331edab Fixed checkbox for starting service and actually starting it 2015-05-12 18:04:42 +00:00
salt_build
7cbabd0cf9 Updated icon file for windows 2015-04-21 22:33:59 +00:00
Colton Myers
92c51affc5 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-21 10:33:39 -06:00
salt_build
7235bb0b68 Removed some parenthesis 2015-04-20 23:59:33 +00:00
salt_build
a4e24f5c6a Added new panel graphic to installer 2015-04-20 23:56:11 +00:00
salt_build
3f180cfaae Added ability to send a version with a space in it 2015-04-20 21:55:57 +00:00
Colton Myers
929b7baaf3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-17 11:38:54 -06:00
Justin Findlay
3c91459de2 Merge pull request #22759 from twangboy/fix_bat_one_last_time 
Final edits to the batch files for running salt
 2015-04-16 22:31:15 -06:00
salt_build
4d25af8acf Fixed version not showing in Add/Remove Programs 2015-04-16 22:43:51 +00:00
salt_build
075f82e046 Final edits to the batch files for running salt 2015-04-16 22:08:27 +00:00
twangboy
223c46a38e Removed redundent \ and " 2015-04-16 18:40:23 +00:00
Colton Myers
8d9874a78a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-16 10:37:38 -06:00
salt_build
2d3d0b1c15 Changed %cd% to %~dp0 2015-04-16 15:07:28 +00:00
Colton Myers
9099884809 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/config.rst
    salt/modules/win_disk.py
    salt/modules/yumpkg.py
    salt/pillar/s3.py
    salt/states/service.py
    salt/utils/event.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/netapi/test_client.py
    tests/unit/states/archive_test.py
 2015-04-14 11:03:03 -06:00
salt_build
6d99681b8d Moved file deletion to happen after user clicks install 2015-04-08 18:25:56 +00:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
 2015-04-07 10:05:35 -06:00
Shane Lee
b71602a39c Update BuildSalt.bat 2015-04-06 17:52:58 -06:00
Shane Lee
4a3a8b4606 Update BuildSalt.bat 2015-04-06 17:52:38 -06:00
Shane Lee
ba1d3965d2 Update BuildSalt.bat 2015-04-06 17:51:49 -06:00
Shane Lee
8e8b4fb26f Update BuildSalt.bat 2015-04-06 17:50:49 -06:00
salt_build
c898b951bc Fixed problem with pip not working on portable install 2015-04-06 23:04:24 +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
Colton Myers
1e3160f21c Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-01 14:17:35 -06:00
Shane Lee
9ab3d5e5b4 Merge pull request #22222 from twangboy/fix_installer 
Fixed problem with nested directories
 2015-04-01 08:08:05 -06:00
C. R. Oldham
bfeb08168e Merge remote-tracking branch 'upstream/2014.7' into 2015.2 2015-03-31 17:40:50 -06:00
twangboy
8615e8d403 Fixed problem with nested directories 2015-03-31 17:26:46 -06:00
twangboy
864438389d Removed _tkinter.lib 2015-03-31 11:53:17 -06:00
Colton Myers
0269f3d544 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-30 09:30:58 -06:00
twangboy
110b0ef6f1 Remove .chm files from windows build 2015-03-30 14:26:30 +00:00
twangboy
de85a03add Pull minion config settings from minion conf 2015-03-28 00:14:01 +00:00
Colton Myers
c924814e64 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-03-26 08:59:47 -06: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
twangboy
d3cb6ddcd5 Accounted for silent install 2015-03-25 16:27:41 -06:00
twangboy
6bfe6fd4f6 Checks for existing installation and prompts to remove 2015-03-25 16:27:41 -06:00
Colton Myers
9b8f6085d2 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    pkg/windows/BuildSalt.bat
    pkg/windows/installer/Salt-Minion-Setup.nsi
 2015-03-20 14:39:22 -06:00
Shane Lee
febef7eb78 Update salt-cp.bat 2015-03-20 14:18:57 -06:00
twangboy
d5da92e58c Added batchfiles to mimick the behavior of the exe's 2015-03-20 14:12:48 -06:00
twangboy
81025d8388 Fixed version parameter 2015-03-20 13:50:56 -06:00
twangboy
db64bef89c Updated BuildSalt and Salt-Minion-Setup.nsi 
- Fixed problem with missing folders and files
- Fixed problem with detecting cpu architecture
 2015-03-20 13:48:08 -06:00
Colton Myers
270027ff8d Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    pkg/windows/installer/Salt-Minion-Setup.nsi
    salt/modules/mine.py
 2015-03-20 13:34:30 -06:00
twangboy
fbec10071a Edited Salt-Minion-Setup.nsi, Added BuildSalt.bat 2015-03-20 13:19:44 -06:00
twangboy
98944e9842 Added file to slim the windows install 2015-03-20 13:18:37 -06:00
twangboy
ced2e57165 Added files for the New Portable Salt Installer 2015-03-20 11:25:13 -06:00
twangboy
3af33668c9 Edited Salt-Minion-Setup.nsi, Added BuildSalt.bat 2015-03-18 19:19:16 -06:00
twangboy
cccb24da92 Added file to slim the windows install 2015-03-18 17:52:27 -06:00
twangboy
43b560e2ee Added files for the New Portable Salt Installer 2015-03-18 17:35:09 -06:00
Colton Myers
f6eae029f0 Merge branch '2014.7' into merge-forward-2015.2 
Conflicts:
	pkg/windows/installer/Salt-Minion-Setup.nsi
	salt/grains/core.py
	salt/minion.py
	salt/modules/mongodb.py
	salt/states/archive.py
	salt/states/mount.py
	salt/utils/master.py
	salt/utils/schedule.py
	salt/utils/thin.py
	tests/jenkins-ng.py
 2015-01-06 13:14:27 -07:00
Loren Gordon
7f7c7bd337 Update vcredist version, fixes saltstack/salt#19387 
Install the most current version of vcredist, Microsoft Visual C++ 2008
Service Pack 1 Redistributable Package MFC Security Update.
 2015-01-06 12:18:13 -05:00
Tiru Srikantha
d1192819c5 Change URL for vcredist_x64 to SP1 DL URL 
Fixes saltstack/salt#18935
 2014-12-11 14:27:32 -08:00
Pedro Algarvio
733b31da23 Merge branch '2014.7' into develop 
Conflicts:
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-11-27 03:59:40 +00:00
C. R. Oldham
f41cc45a8f Switch nssm back to 32-bit 2014-11-26 13:35:53 -07:00
Arjan de Vries
e01c27d225 Fix Silent install added option /SD to messagebox 2014-11-10 15:58:53 +01:00
Colton Myers
0cc0d64136 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/hg.py
 2014-10-31 16:14:34 -06:00
C. R. Oldham
6c9be002c5 Update nssm to 2.24 2014-10-30 22:15:26 -04:00
David Boucha
810d2a6d9a Merge pull request #15664 from UtahDave/2014.7fixreg 
replace version with a jinja variable
 2014-09-10 13:55:23 -06:00
David Boucha
df91a0929a replace version with a jinja variable 2014-09-10 13:52:13 -06:00
steve
bc3ade860c catch exceptions and fix some vars 2014-08-05 22:39:57 -04:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
David Boucha
ea12719881 bump windows installer version 2014-07-12 23:18:58 -06:00
David Boucha
679b178111 bump windows installer version number 2014-05-19 17:57:50 -06:00
Ryan Davis
8fdced7877 windows: update to nssm 2.21.1 
new 32-bit binary for nssm.exe, upgrading from the previous 2.16.

Has some bug fixes, see http://nssm.cc/changelog.

Driving impetus to upgrade was "Silently ignore INTERROGATE control.",
on win2012 nssm spews ~30 event log messages per minute.

Tested by stopping windows minion, replacing nssm.exe, and restarting.
 2014-05-02 09:13:00 -04:00
David Boucha
9c5880c188 bump windows installer version 2014-03-31 13:33:39 -06:00
pzbitskiy
b25d21f666 Check for VC 2008 redist package in Windows installer 
* Download and install vcredist_x86 / vcredist_x64 if needed
* Fix for #10716
 2014-03-22 17:31:05 +04:00
David Boucha
34a12d0929 bump windows installer version number 2014-02-25 09:58:34 -07:00
Mike Place
a485eceac9 Fix all broken links in docs. Ignore certain known-good links. Adjust many links that are returning 301. 
Conflicts:
	doc/topics/installation/index.rst
 2014-02-20 16:16:59 -07:00
David Boucha
b44e681c5c release 0.17.5 Windows installers 2014-02-14 01:45:48 -07:00
David Boucha
21c3ff1c70 bump Salt windows installer version 2013-12-26 10:40:19 -07:00
EquinoxeFR
34c6f6c831 Removing nsProcess plugin. Using ExecWait and a sleep 3s to stop salt-minion. 2013-10-24 15:19:21 +02:00
EquinoxeFR
f6ca119edc Adding close process and service stop to windows installer 2013-10-22 12:12:02 +02:00
David Boucha
746369d7b6 Bump Salt Windows installer version. Add to docs 2013-10-18 01:24:37 -06:00
David Boucha
45724660fb Bump windows installer version number 2013-10-08 11:31:19 -06:00
David Boucha
21b6f8790f Bump minion version number. 2013-08-11 18:01:21 -06:00
David Boucha
57ef0dc0f7 bump Salt windows installer version to 0.16.2 2013-08-02 11:09:34 -06:00
Pedro Algarvio
9be409e95b Merge pull request #6425 from UtahDave/lockdown_windows 
Set permissions on Salt dir
 2013-07-29 18:41:25 -07:00
David Boucha
5a48188f54 Set permissions on Salt dir 
Only allow Administrator's group and System user access to
c:\salt
 2013-07-29 19:07:52 -06:00
David Boucha
2b193b0a1d bump windows installer version 2013-07-29 18:59:48 -06:00
Thomas L. Kula
54a0746b4e Backoff when minion fails to connect 
NOTE: This is a potential change --- I haven't actually gotten a
test environment to try this out.

This adds a configuration option to the minion,
`acceptance_wait_time_max', that if set changes the acceptance
wait loop to add `acceptance_wait_time' seconds to the wait between
each iteration, up to this maximum value.

POTENTIAL FIX: Issue #5813
 2013-07-27 16:51:38 -04:00
David Boucha
c9b5223999 Bump Windows installer version number 2013-06-22 01:22:49 -06:00
David Boucha
4dd19fdb18 bump windows installer version number. 
0.15.3
 2013-05-31 18:29:01 -06:00
Chris Rebert
e89cbf4447 capitalize Linux in comments/docs 2013-05-15 19:21:50 -07:00
David Boucha
ca707eccff Turn off multiprocessing on Windows for now 2013-05-05 01:11:05 -06:00
David Boucha
1c7442ec19 Set windows installer to 0.15.0 2013-05-04 22:39:29 -06:00
David Boucha
c0aef8bccd Bump windows installer version 2013-04-26 10:03:28 -06:00
David Boucha
e22f0a83fa Bump windows installer version 0.13.3 2013-03-19 19:51:16 -06:00
David Boucha
b343d4fb13 bump Windows installer version 2013-03-13 10:26:18 -06:00
David Boucha
876af6ea3a Properly add the system arch to installer name 
AMD64
or
X86
 2013-03-10 00:26:13 -07:00
David Boucha
ea9d6902b4 bump version to 0.13.1 2013-02-17 18:07:04 -07:00
David Boucha
065cfc4bf4 Update Windows Salt Installer version to 0.13.0 2013-02-12 11:08:59 -07:00
David Boucha
cf7d6f55ec bump version to 0.12.1 2013-02-10 14:41:41 -07:00
David Boucha
be50743e2b Add service dependency 2013-01-04 11:29:58 -07:00
David Boucha
42972a8cb0 Add Windows Installer Package resources. 2013-01-04 08:57:30 -07:00