valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
88,976 Commits 24 Branches 182 Tags 341 MiB
b6725536f8
Commit Graph

922 Commits

Author SHA1 Message Date
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
twangboy
d199ef5da0
Fix postinstall for pywin32 2017-12-06 09:10:02 -07:00
twangboy
da239bda24
Add Python 2.7.14 to clean_env.bat 2017-12-06 08:59:23 -07:00
twangboy
4bd0106c35
Fix pywin32 install 2017-12-06 08:50:11 -07:00
twangboy
1ba89026b2
Consolidate req file 2017-12-06 08:35:31 -07:00
twangboy
3263b0b97e
Update pip packages 2017-12-05 16:51:09 -07:00
Nicole Thomas
e52aac2587 Merge pull request #43649 from twangboy/win_installer_multimaster 
Add support for multimaster setup
 2017-10-19 09:20:44 -04:00
rallytime
b8dc018178
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/opkg.py
  - salt/utils/templates.py
  - tests/unit/templates/test_jinja.py
 2017-10-18 09:37:47 -04:00
rallytime
c4ae4a6b50
Merge branch '2017.7.2' into '2017.7' 
Conflicts:
  - doc/topics/releases/2017.7.2.rst
 2017-10-16 13:53:13 -04:00
twangboy
e9075725dc
Add documenting comments 2017-10-16 10:51:33 -06:00
twangboy
7fe2350365
Add support for multimaster setup 
Allows you to pass a comma-delimited list of masters to the master combo
box or the /master command line switch
Parses the existing minion config file to get multimaster settings
Adds an checkbox to use the existing config in the minion config page
When the box is checked, show the existing config grayed out
When unchecked, show default values
Adss the /use-existing-config= command line switch for use from the
command line
Adds support for a help switch on the command line (/?) to display the
supported command line paramaters
 2017-10-16 10:51:33 -06:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-10-10 16:34:52 -04:00
apapp
87d676f08a
add -n with netstat so we don't resolve 2017-10-03 13:32:30 -04:00
apapp
0878dbd0e8 add -n with netstat so we don't resolve 2017-09-29 15:03:56 -04:00
Daniel Wallace
f7df41fa94
split build and install for pkg osx 2017-09-26 12:59:23 -06:00
rallytime
e0ae50e489
Merge branch '2017.7' into 'develop' 
Conflicts:
  - pkg/salt.bash
  - salt/client/mixins.py
  - salt/minion.py
  - salt/modules/aptpkg.py
  - salt/modules/boto_vpc.py
  - salt/modules/win_pkg.py
  - salt/utils/reactor.py
  - tests/unit/utils/test_reactor.py
 2017-09-22 10:24:04 -04:00
rallytime
a401166bd5 Merge branch '2017.7.2' into '2017.7' 
No conflicts.
 2017-09-21 09:52:38 -04:00
rallytime
57b9d642c2 Merge branch '2016.11.8' into '2016.11' 
No conflicts.
 2017-09-18 16:40:05 -04:00
twangboy
f33395f1ee Fix logic in /etc/paths.d/salt detection 2017-09-15 13:41:23 -06:00
twangboy
1b0a4d39d2 Fix logic in /etc/paths.d/salt detection 2017-09-15 13:37:53 -06:00
rallytime
bfcfcd75e8 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/loader.py
  - salt/minion.py
  - salt/modules/alternatives.py
  - salt/modules/genesis.py
  - tests/unit/modules/test_hosts.py
  - tests/unit/modules/test_ini_manage.py
 2017-09-13 15:15:04 -04: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
rallytime
5701d54516 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/state.py
  - salt/utils/gitfs.py
 2017-09-06 09:39:27 -04: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
0eafc59f33 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/win_groupadd.py
  - salt/modules/yumpkg.py
  - salt/state.py
  - salt/utils/url.py
 2017-08-23 10:07:01 -04: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
rallytime
93c11d827a Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/minion.py
 2017-08-17 09:30:50 -04:00
twangboy
ffb23fbe47 Remove the line that wipes out the cache 2017-08-14 12:26:27 -06:00
rallytime
78e744bda4 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/fileclient.py
  - salt/modules/status.py
  - tests/integration/states/test_npm.py
 2017-08-14 14:21:17 -04: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
rallytime
f20f3742cb Merge branch '2017.7' into 'develop' 
Conflicts:
  - tests/unit/test_crypt.py
 2017-08-07 10:43:06 -04:00