diff --git a/AUTHORS.rst b/AUTHORS.rst index fdbce32..e8e82c5 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -10,6 +10,7 @@ Name Nick Email Alec Koumjian akoumjian akoumjian@gmail.com Alex Van't Hof alexvh Angelo Gründler plueschopath angelo.gruendler@w1r3.net +Boris Feld Lothiraldan bruce-one bruce-one Chris Rebert cvrebert chris.rebert@hulu.com Christer Edwards cedwards diff --git a/ChangeLog b/ChangeLog index 21c6a3b..50085a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ Version 2014.xx.xx: * Fixed a bug on the services enabled function searching logic. * Arch, Fedora, openSUSE and SuSE now check for services enabled, if using systemd * CentOS(and any RedHat based) and Ubuntu now check for services enabled is using upstart + * Distro Support Added: + * Debian 8. Thank You Boris Feld(Lothiraldan). Version 2014.02.19: diff --git a/README.rst b/README.rst index 5211e87..82a2ca8 100644 --- a/README.rst +++ b/README.rst @@ -353,7 +353,7 @@ Supported Operating Systems - Amazon Linux 2012.09 - Arch - CentOS 5/6 -- Debian 6.x/7.x +- Debian 6.x/7.x/8(git installations only) - Fedora 17/18 - FreeBSD 9.1/9.2/10 - Gentoo diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 913cfbb..2f2ba86 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -727,6 +727,9 @@ __gather_linux_system_info() { if [ "$(cat /etc/debian_version)" = "wheezy/sid" ]; then # I've found an EC2 wheezy image which did not tell its version v=$(__parse_version_string "7.0") + elif [ "$(cat /etc/debian_version)" = "jessie/sid" ]; then + # Let's start detecting the upcoming Debian 8 (Jessie) + v=$(__parse_version_string "8.0") fi else echowarn "Unable to parse the Debian Version" @@ -1791,6 +1794,11 @@ _eof return 0 } +install_debian_8_deps__DISABLED() { + install_debian_7_deps || return 1 + return 0 +} + install_debian_git_deps() { if [ $_START_DAEMONS -eq $BS_FALSE ]; then echowarn "Not starting daemons on Debian based distributions is not working mostly because starting them is the default behaviour." @@ -1859,6 +1867,11 @@ install_debian_7_git_deps() { return 0 } +install_debian_8_git_deps() { + install_debian_7_git_deps || return 1 + return 0 +} + __install_debian_stable() { packages="" if [ $_INSTALL_MINION -eq $BS_TRUE ]; then @@ -1894,6 +1907,11 @@ install_debian_7_stable() { return 0 } +install_debian_8_stable() { + __install_debian_stable || return 1 + return 0 +} + install_debian_git() { if [ $_PIP_ALLOWED -eq $BS_TRUE ]; then # Building pyzmq from source to build it against libzmq3. @@ -1920,6 +1938,11 @@ install_debian_7_git() { return 0 } +install_debian_8_git() { + install_debian_git || return 1 + return 0 +} + install_debian_git_post() { for fname in minion master syndic; do