Commit graph

2090 commits

Author SHA1 Message Date
Pedro Algarvio
879fe15e08 Fix sed regex in DISTRO_MINOR_VERSION detection. 2013-02-12 21:26:41 +00:00
Pedro Algarvio
d1cc0760f6 Adapted FreeBSD functions to the recently version matching. Refs #37.
Added `DISTRO_MAJOR_VERSION` to `BS_PACKAGESITE` as suggested by @geoffgarside. Refs #47.
2013-02-12 21:18:57 +00:00
Pedro Algarvio
1bc97bc93e Merge branch 'develop' of github.com:saltstack/salt-bootstrap into develop 2013-02-12 21:16:29 +00:00
Pedro Algarvio
d5166b8942 Merge pull request #47 from geoffgarside/freebsd91
FreeBSD 9.1 support + start daemons
2013-02-12 13:16:07 -08:00
Pedro Algarvio
670fe30ca6 Added support for both major and minor version matching.
Added a bit more of complexity since we can now match functions by major version only, or major and minor version. This will improve arithmetic comparisons sometimes required when choosing which piece of code gets executed.
2013-02-12 21:12:57 +00:00
Geoff Garside
9691062803 Add name to header. 2013-02-12 20:58:50 +00:00
Pedro Algarvio
e9eb656006 Error out when we cannot add EPEL repository support. 2013-02-12 20:23:58 +00:00
Raymond Barbiero
8f443754e9 Replaced DISTRO_VERSION_NO_DOTS string slice with DISTRO_MAJOR_VERSION variable. This should be more future proof. 2013-02-12 20:22:01 +00:00
Geoff Garside
f9b8ff818c Store PACKAGESITE in BS_PACKAGESITE.
If the PACKAGESITE environment variable is set then we will use that
value, otherwise we calculate a sensible default and use that instead.
2013-02-12 19:10:38 +00:00
Geoff Garside
506518a561 Remove duped lines now $fname checks are gone. 2013-02-12 18:48:11 +00:00
Geoff Garside
2abe9fb03c Remove redundant $fname tests when copying configs.
Testing for the sample file existence will protect against the lack of a
syndic.sample file.
2013-02-12 18:44:06 +00:00
Pedro Algarvio
f6080c0422 Allow tweaking colour support from an environment variable.
* Passing something like `BS_COLORS=0` disables colour support and is the same as passing `-N` to the script.
2013-02-12 18:35:31 +00:00
Geoff Garside
5545aa6cfd Make {master,minion}.sample config copying safer.
We make sure they exist first :)
2013-02-12 18:33:07 +00:00
Geoff Garside
f7d14732a4 Copy {master,minion}.sample files if enabled. 2013-02-12 17:59:28 +00:00
Geoff Garside
01bd681a32 Use suggested form for DISTRO_NAME_L final sed. 2013-02-12 17:52:47 +00:00
Geoff Garside
e796bb2941 Allow PACKAGESITE to be overridden by env variable.
If the PACKAGESITE environment variable is not set then the normal
pkgbeta URL will be generated, if the variable is set then this will be
used in preference to the pkgbeta URL.
2013-02-12 00:21:35 +00:00
Geoff Garside
36d0260dcc Fix DISTRO_NAME_L for FreeBSD.
I've tested this with Ubuntu as well as FreeBSD and the [[:space:]]
method appears to work successfully across both OS's.
2013-02-11 23:59:35 +00:00
Geoff Garside
f7559790ef Protect from spamming /etc/rc.conf repeatedly.
The _post functions can be run multiple times. Make sure we don't write
the same string into /etc/rc.conf more than once.
2013-02-11 23:56:04 +00:00
Geoff Garside
451d86afb6 Add start daemons support for FreeBSD. 2013-02-11 23:15:37 +00:00
Geoff Garside
a6ca69b9b4 FreeBSD update salt package -> sysutils/py-salt.
The salt package was renamed to the py- prefix to match other python
based ports. When built the name will be given a shortname of py27-salt,
in order to avoid Python versioning issues in the future we use the full
portname "sysutils/py-salt" which should always find the appropriate
version.
2013-02-11 23:01:15 +00:00
Geoff Garside
0845b9dbcb Add support for FreeBSD 9.1 as well as 9.0. 2013-02-11 23:01:15 +00:00
Pedro Algarvio
67deb7dc83 Also include the daemons restart info in the script's documentation. 2013-02-11 22:35:49 +00:00
Pedro Algarvio
062fe28091 Define truth values to use within the script. Omit debug output while still allowing it to show up with the -D flag. 2013-02-11 20:44:46 +00:00
Pedro Algarvio
2c90980644 Add minimal color support to the script. 2013-02-11 20:22:33 +00:00
Pedro Algarvio
ab00e5f439 Renamed echoerr to echoerror. Added echoinfo and echodebug.
Our "logging" messages now use all of the above "levels" and no longer require any prefix, just the actual message.
2013-02-11 19:17:21 +00:00
Pedro Algarvio
b23f3c3466 Add bogus echo to disabled functions. 2013-02-08 12:54:55 +00:00
Pedro Algarvio
0f93b28d2e Added start daemons function support to SmartOS installations. 2013-02-08 12:43:01 +00:00
Pedro Algarvio
1b1727d8a3 Some work was done to add start daemons support to FreeBSD installs. Needs to be completed when handling #20. 2013-02-08 12:38:00 +00:00
Pedro Algarvio
427ad264d6 Added start daemons function support to Arch installations. 2013-02-08 12:33:47 +00:00
Pedro Algarvio
821182df50 Added start daemons function support to Amazon Linux AMI installations. 2013-02-08 12:15:11 +00:00
Pedro Algarvio
e3c979347f Added start daemons function support to RedHat installations. 2013-02-08 12:12:08 +00:00
Pedro Algarvio
47be06602d Added start daemons function support to CentOS git installations. 2013-02-08 12:09:37 +00:00
Pedro Algarvio
e4de330af2 Added start daemons function support to CentOS stable installations. 2013-02-08 12:07:11 +00:00
Pedro Algarvio
f5db3710b8 Added start daemons function support to Fedora git installations. 2013-02-08 12:01:50 +00:00
Pedro Algarvio
ac281ec161 Added start daemons support to Debian git installations. 2013-02-08 11:59:06 +00:00
Pedro Algarvio
0cd2397fe9 Moved Ubuntu git installations to use the new start daemons function.
* This is only done in git installations because Ubuntu defines that any daemon should run right after installing.
2013-02-08 11:56:03 +00:00
Pedro Algarvio
00d4c44e28 Add the search/execution base for starting daemons in a separate, optional, function. 2013-02-08 11:39:27 +00:00
Pedro Algarvio
7c19b81aac Output errors to stderr and not stdout. 2013-02-07 20:48:50 +00:00
Pedro Algarvio
c1325acb23 Finish renaming script. Bumped version to mark this event. 2013-02-07 01:44:38 +00:00
Pedro Algarvio
13dd4ecfa8 Renamed the script since now we don't just install a minion. 2013-02-07 01:39:41 +00:00
Renamed from bootstrap-salt-minion.sh (Browse further)