Commit graph

2126 commits

Author SHA1 Message Date
Ronald van Zantvoort
1b16dd993b Fix CentOS git setup.py syntax error upon installation 2016-02-01 16:32:20 +01:00
Justin Findlay
1141bee195 Merge pull request #741 from kojiromike/posix-checkexists
Use POSIX-Compliant Command-Exists Test
2016-01-29 15:36:47 -07:00
Ronald van Zantvoort
6b9a4eb207 Merge remote-tracking branch 'origin/patch-1' into prod 2016-01-28 16:55:10 +01:00
Ronald van Zantvoort
0dfd289eaa Merge branch 'pegging-for-yum' into prod 2016-01-28 16:54:57 +01:00
Ronald van Zantvoort
051351de0c Fix for enabling universe repo on Ubuntu
If universe must be enabled, old-releases will always be enabled, leading to errors
2016-01-28 16:49:04 +01:00
Michael A. Smith
993e995939 Discover if Commands Exist in a Portable Way 2016-01-27 19:49:59 -05:00
Michael A. Smith
da4414a871 Use POSIX-Compliant Command-Exists Test
Suggest the `command` command instead of `which` to determine if the `lsb_release` command exists.
`which` is a non-standard command and this script and its documentation should work across as many POSIX like systems as possible.
`command` is more portable than `which`.

To be consistent with the existing suggestion, the updated suggestion will only act if `lsb_release` exists and is a simple command, not an alias or shell function.

References:
http://stackoverflow.com/a/677212/418413
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
2016-01-27 19:47:47 -05:00
Justin Findlay
5480cf9b09 Merge pull request #743 from pra85/patch-1
Update license year range
2016-01-26 15:12:54 -07:00
Prayag Verma
66c3d27275 Update license year range 2016-01-26 23:02:08 +05:30
EYJ
1dc003e4dd Do not fetch saltstack repo if shallow-cloning from a non-saltstack repo 2016-01-25 17:09:37 +01:00
EYJ
2e2dae3f0f Add -f option to force shallow cloning 2016-01-25 17:07:03 +01:00
Justin Anderson
a237a4cca5 Merge pull request #738 from rmohr/copr
COPR project moved
2016-01-25 08:41:45 -07:00
Roman Mohr
f8715cb97f COPR project moved
Replace old url http://copr.fedoraproject.org with
https://copr.fedorainfracloud.org to fix broken bootstrap script.
2016-01-24 18:38:41 +01:00
Justin Findlay
849c5b72c4 Merge pull request #564 from The-Loeki/patch-1
Fix when using upstream tags
2016-01-21 16:57:20 -07:00
Justin Findlay
51fa2c2a76 Merge pull request #733 from jfindlay/tmp
Update #544 with the ideas in #541
2016-01-13 16:33:31 -07:00
Justin Findlay
63d1c1eec4 overwrite master configs if -C and -M or -S given
Updates #544 with the ideas in #541.
2016-01-13 16:13:30 -07:00
Beau Hargis
ba99ff9cbc Remove dependency on -c flag being required for _CONFIG_ONLY as it appears to be logically superfluous in most contexts. 2016-01-13 15:54:48 -07:00
Beau Hargis
deb043f26c Added conditional for _CONFIG_ONLY in config_salt so that it is evaluated correctly. 2016-01-13 15:54:48 -07:00
Pedro Algarvio
9e651004f9 Merge pull request #732 from jfindlay/overwrite
Merge #541
2016-01-13 22:29:11 +00:00
Justin Findlay
52a6bd2b54 warn user about overwrite when -C is used 2016-01-13 15:08:41 -07:00
Marcus Furlong
b8a5a0a12e Don't add zypp repo if it already exists
closes #730
2016-01-13 14:32:37 +11:00
Justin Findlay
cec5b5a7ac Merge pull request #692 from hipikat/bootstrap-sleep
Process -s (default sleep for service restarts) in bootstrap-salt.sh
2016-01-08 15:39:11 -07:00
Pedro Algarvio
1e693320b7 Merge pull request #726 from jtand/debian_pyzmq
Sometimes bootstrap doesn't install zmq
2016-01-07 22:54:29 +00:00
justinta89
1f69dd0a96 Changed from using python to dpkg-query 2016-01-07 15:51:25 -07:00
justinta89
0d9827b842 Added parentheses on print 2016-01-07 15:06:48 -07:00
justinta89
5d94fc33d3 Sometimes bootstrap doesn't install zmq
When installing from git, bootstrap seems to skip over the zmq installation.
This checks if zmq has been installed, if not, it installs it.
2016-01-07 14:58:38 -07:00
Justin Findlay
6e8229a95c Merge pull request #725 from aboe76/tumbleweed_support
Add opensuse_Tumbleweed support
2016-01-07 11:58:45 -07:00
Niels Abspoel
d699b221d9 improve openSUSE major version code 2016-01-06 20:46:27 +01:00
Justin Findlay
3132db0a8b Merge pull request #721 from vutny/develop
Remove SaltStack COPR repository configuration for CentOS/RHEL5
2016-01-06 10:59:47 -07:00
Justin Findlay
ccdd0059e6 Merge pull request #720 from vutny/cleanup-rhel-optionals-repo
Remove RHEL optional repo check and enable
2016-01-06 10:54:06 -07:00
Sergey Paramonov
2025bc874b fix for FreeBSD 11 installation functions 2015-12-31 12:47:07 -05:00
Sergey Paramonov
f3d2385358 adding support for OpenBSD 2015-12-30 00:13:11 -05:00
Justin Findlay
a69a89ac5f Merge pull request #705 from abednarik/update_setup_options_ubuntu
Removed deprecated cli option.
2015-12-25 12:39:54 -07:00
abednarik
49d1df8a1b Removed deprecated cli option.
Is no longer needed to have this 2 options to bookstrap salt, since now --salt-config-dir is a global option.

Fixes #704
2015-12-25 10:52:43 -03:00
Denys Havrysh
b07dd322ab Remove SaltStack COPR repository configuration for CentOS/RHEL5 2015-12-25 15:06:43 +02:00
Denys Havrysh
5d327c1325 Remove RHEL optional repo check and enable
All necessary packages will be installed from salt repo
2015-12-24 14:32:29 +02:00
Justin Findlay
cb203d5251 Merge pull request #719 from vutny/fix-epel-release-rhel5
Fix `epel-release` package installation on CentOS/RHEL 5
2015-12-23 11:44:07 -07:00
Denys Havrysh
3f09d6b4d9 Make sure curl is available on minimal CentOS 5 images before installing epel-release package 2015-12-23 17:57:54 +02:00
Denys Havrysh
d3ac593a08 Fix EPEL release package installation on CentOS/RHEL 5 2015-12-23 17:56:58 +02:00
Denys Havrysh
4d4de1ec74 Make curl follow HTTP 3XX redirections (wget like behaviour) 2015-12-23 17:21:51 +02:00
Justin Findlay
ee8cab1c1f Merge pull request #718 from vutny/fix-git-without-man
Fix git invocation fail when `man` command is not available
2015-12-22 11:57:30 -07:00
Justin Findlay
71b0b85056 Merge pull request #717 from vutny/fix-epel-repo-detection
Better EPEL repository detection on RHEL and CentOS
2015-12-22 10:43:02 -07:00
Denys Havrysh
79789642a9 Fix git invocation fail when man command is not available 2015-12-22 18:05:28 +02:00
Denys Havrysh
b34efe5633 Fix EPEL repository enabled check
* use global variable
* handle output from YUM command with repo expiry mark
* suppress grep output instead of redirection
2015-12-22 10:07:12 +02:00
Denys Havrysh
6517e03b78 Better EPEL repository detection on RHEL and CentOS 2015-12-21 18:19:37 +02:00
Justin Findlay
009d7c7728 Merge pull request #711 from brandon099/develop
Update SaltStack repo location and latest version for Windows
2015-12-17 12:12:09 -07:00
Brandon Clifford
05f344c596 Update SaltStack repo location and latest version 2015-12-17 11:34:38 -07:00
Justin Findlay
2415bfa1ae Merge pull request #702 from wolfpackmars2/patch-1
Remove redundant lines
2015-12-08 15:43:51 -07:00
Steve Groesz
573091b4cd Remove redundant lines
The referenced package was included in a previous line.  This is merely a cleanup change to prevent future problems and increase maintainability of the code.
2015-12-07 03:59:32 -06:00
Pedro Algarvio
7671ae5631 Add Steve Groesz(@wolfpackmars2) to AUTHORS 2015-12-04 11:43:54 +00:00