Commit Graph

71 Commits

Author SHA1 Message Date
twangboy
32b9d2ad25
Update requests for osx 2018-12-27 12:03:00 -07:00
twangboy
23f78b0c5c
Upgrade requests to 2.20.1 2018-11-08 11:07:38 -07:00
twangboy
750d3fa29e
Remove trusted host switches 2018-09-06 09:59:46 -06:00
twangboy
6b42e73ee9
Fix issues with build script on OSX
Upgrade openSSL to 1.0.2p
Upgrade six to 1.11
2018-09-06 09:37:24 -06:00
twangboy
a112eaa597
Fix path to libsodium tarball 2018-08-23 10:15:28 -06:00
twangboy
7dae9bb2a1
Fix Windows and OSX installers
Adds support to Universal Runtime Libraries (UCRT) for Windows
Adds futures to the req.txt for OSX
2018-08-20 16:11:34 -06:00
Daniel Wallace
f7df41fa94
split build and install for pkg osx 2017-09-26 12:59:23 -06:00
twangboy
f33395f1ee Fix logic in /etc/paths.d/salt detection 2017-09-15 13:41:23 -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
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
69d5973651 Compile scripts with -E -s params for python 2017-07-26 16:36:25 -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
rallytime
52edbffc85 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/cache/all/index.rst
  - doc/topics/cache/index.rst
  - salt/cache/localfs.py
  - salt/modules/boto_rds.py
  - salt/roster/cloud.py
  - salt/states/virtualenv_mod.py
  - tests/integration/states/test_archive.py
  - tests/unit/modules/test_dockermod.py
  - tests/unit/states/dockerng_test.py
2017-03-28 17:09:30 -06:00
rallytime
e77e86db3a Merge branch '2016.3' into '2016.11'
No conflicts.
2017-03-27 17:27:49 -06:00
twangboy
3207d670c5 Fix osx build 2017-03-27 14:52:19 -06:00
rallytime
8928436bdd Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/pillar/__init__.py
2017-01-30 09:06:27 -07:00
rallytime
fdaa5ac1b0 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/master.py
  - salt/pillar/__init__.py
  - salt/utils/__init__.py
2017-01-26 14:09:37 -07:00
twangboy
62e608b627 Update Jinja2 to 2.9.4 2017-01-24 09:44:23 -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
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
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
twangboy
8091a3065e Create paths.d directory 2016-11-03 09:27:50 -06:00
Shane Lee
858e5c1772 Update Python to 2.7.12 for Mac (#34493) 2016-07-06 17:10:53 -04:00
Clayton Burlison
b483d1d8a6 Update mac native package for upcoming release
This solves an issue where the package `resources` and package `scripts` were being added to the root of the install drive.

Change Spelling for:
* xCode to XCode
* and capitalize Command Line Tools

to match Apple's offical documentation.

Ref: https://developer.apple.com/xcode/
and https://developer.apple.com/library/ios/technotes/tn2339/_index.html
2016-06-01 23:32:23 -05:00
Salt Admin
7844059dcf Handle system architecture 2016-05-25 14:11:12 -06:00
Shane Lee
4c51d31cae Fix salt-config script for mac install (#33250) 2016-05-15 13:08:10 -07:00
Shane Lee
ae32f17b82 Add salt-config script to Mac Installer (#32873)
* Add script to configure salt

* Add salt-config.sh to installer scripts

* Add additional information to welcome/conclusion

* Fix text in conclusion

* Make salt-config.sh executable

* Create symlink to salt-config.sh

* Create minion.d directory

* Fix changed comparison to determine restart

* Add -f option to symlink creation
2016-04-29 11:01:20 -07:00
Shane Lee
8de1c6c094 Add debugging options to mac service configs (#32789) 2016-04-25 11:06:30 -06:00
Shane Lee
c657f3d829 Remove additional unneeded files and dirs (#32790) 2016-04-25 09:23:47 -06:00
twangboy
2e065e4a20 Fix documentation
Fix conflicts with parameters and default paths
2016-03-31 15:32:32 -06:00
twangboy
de4d66cdbf Fix build scripts for mac
Swap the order of the version and the temp dir parameters
Remove extra blank lines
Removed sourcing of additional scripts, use sudo
Additional Commenting
Fix typo (Evn vs Env)
Add check for Full XCode, errors if not installed
Add -L to curl command to handle redirects
Sudo -H for all sudo commands
Remove unnecessary symbolic link creation
2016-03-31 15:24:30 -06:00
twangboy
a0edabf210 Add /opt/salt/bin to PATH
uses files under paths.d
also removed legacy launchctl load command
2016-03-25 16:14:40 -06:00
twangboy
61a91175a9 Add /opt/salt/bin to path 2016-03-25 15:43:28 -06:00
Denys Havrysh
fbfc3abccf Remove trailing white spaces in files under pkg/ dir 2016-03-01 17:37:18 +02:00
twangboy
3654a0e0c2 Change 2015 to 2016 in license file 2016-02-05 09:37:46 -07:00
twangboy
aa7d0602a8 Update instructions in readme.md for shasum 2016-02-05 09:36:23 -07:00
twangboy
6f1a8f4146 Added code to add /opt/salt/bin to the path
remmed out
2016-02-05 09:36:02 -07:00