From 09661e0b2df508eec51a840d5d1ef7e3f4cee5f4 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 10:14:29 +0000 Subject: [PATCH 1/7] Prepare for next development cycle --- ChangeLog | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 95a9e76..b530c8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +Version 2015.xx.xx: + + Version 2015.02.27: * Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van Zantvoort(The-Loeki) From 82b80cf26e74b5cbac1e6f077f976aafd53e1696 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 10:14:47 +0000 Subject: [PATCH 2/7] Enable the Wheezy backports if not already enabled --- bootstrap-salt.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index e714c4e..6de32be 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2098,6 +2098,16 @@ install_debian_7_deps() { # Install Keys __apt_get_install_noinput debian-archive-keyring && apt-get update + # Debian Backports + if [ "$(grep -R 'backports.debian.org' /etc/apt)" = "" ]; then + echo "deb http://backports.debian.org/debian-backports wheezy-backports main" >> \ + /etc/apt/sources.list.d/backports.list + + # Add the backports key + gpg --keyserver pgpkeys.mit.edu --recv-key 8B48AD6246925553 + gpg -a --export 8B48AD6246925553 | apt-key add - + fi + # Saltstack's Stable Debian repository if [ "$(grep -R 'wheezy-saltstack' /etc/apt)" = "" ]; then echo "deb http://debian.saltstack.com/debian wheezy-saltstack main" >> \ From 9a88bab0a67919b5c11bb3bddae89db255eb511c Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 10:19:11 +0000 Subject: [PATCH 3/7] Beware of commented out entries --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 6de32be..ef883d2 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2039,7 +2039,7 @@ _eof fi # Debian Backports - if [ "$(grep -R 'backports.debian.org' /etc/apt)" = "" ]; then + if [ "$(grep -R 'backports.debian.org' /etc/apt | grep -v "^#")" = "" ]; then echo "deb http://backports.debian.org/debian-backports squeeze-backports main" >> \ /etc/apt/sources.list.d/backports.list @@ -2099,7 +2099,7 @@ install_debian_7_deps() { __apt_get_install_noinput debian-archive-keyring && apt-get update # Debian Backports - if [ "$(grep -R 'backports.debian.org' /etc/apt)" = "" ]; then + if [ "$(grep -R 'backports.debian.org' /etc/apt | grep -v "^#")" = "" ]; then echo "deb http://backports.debian.org/debian-backports wheezy-backports main" >> \ /etc/apt/sources.list.d/backports.list From aa7c077fa97c3b0528a163972934581c693c2ff1 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 10:45:41 +0000 Subject: [PATCH 4/7] Fixed backports URL --- bootstrap-salt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index ef883d2..63b082b 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2099,8 +2099,8 @@ install_debian_7_deps() { __apt_get_install_noinput debian-archive-keyring && apt-get update # Debian Backports - if [ "$(grep -R 'backports.debian.org' /etc/apt | grep -v "^#")" = "" ]; then - echo "deb http://backports.debian.org/debian-backports wheezy-backports main" >> \ + if [ "$(grep -R 'wheezy-backports' /etc/apt | grep -v "^#")" = "" ]; then + echo "deb http://http.debian.net/debian wheezy-backports main" >> \ /etc/apt/sources.list.d/backports.list # Add the backports key From 83da7a5f6939e43d788e09dfd28a0e3296ad59e7 Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 19:22:04 +0000 Subject: [PATCH 5/7] Point to new backports URL. No need to get the GPG keys --- bootstrap-salt.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 63b082b..3d4b4d4 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2039,13 +2039,9 @@ _eof fi # Debian Backports - if [ "$(grep -R 'backports.debian.org' /etc/apt | grep -v "^#")" = "" ]; then - echo "deb http://backports.debian.org/debian-backports squeeze-backports main" >> \ + if [ "$(grep -R 'squeeze-backports' /etc/apt | grep -v "^#")" = "" ]; then + echo "deb http://http.debian.net/debian-backports squeeze-backports main" >> \ /etc/apt/sources.list.d/backports.list - - # Add the backports key - gpg --keyserver pgpkeys.mit.edu --recv-key 8B48AD6246925553 - gpg -a --export 8B48AD6246925553 | apt-key add - fi # Saltstack's Stable Debian repository From e5d50e392f55dd087a8664d92b1e2257fe26e12d Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Fri, 27 Feb 2015 19:43:49 +0000 Subject: [PATCH 6/7] No need to import keys --- bootstrap-salt.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index 3d4b4d4..e8dc880 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -2098,10 +2098,6 @@ install_debian_7_deps() { if [ "$(grep -R 'wheezy-backports' /etc/apt | grep -v "^#")" = "" ]; then echo "deb http://http.debian.net/debian wheezy-backports main" >> \ /etc/apt/sources.list.d/backports.list - - # Add the backports key - gpg --keyserver pgpkeys.mit.edu --recv-key 8B48AD6246925553 - gpg -a --export 8B48AD6246925553 | apt-key add - fi # Saltstack's Stable Debian repository From c782ac9f6e3fdaf5dd4dd43bee3d76dfb2b761ab Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Sat, 28 Feb 2015 15:06:30 +0000 Subject: [PATCH 7/7] Update changes log. Bump version for stable release. --- ChangeLog | 4 ++-- bootstrap-salt.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b530c8e..e9c47bb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -Version 2015.xx.xx: - +Version 2015.02.28: + * Fix Debian backports repository. Version 2015.02.27: * Try other tools besides wget when downloading the COPR repo file. Thanks Ronald van diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh index e8dc880..92fe9b4 100755 --- a/bootstrap-salt.sh +++ b/bootstrap-salt.sh @@ -17,7 +17,7 @@ # CREATED: 10/15/2012 09:49:37 PM WEST #====================================================================================================================== set -o nounset # Treat unset variables as an error -__ScriptVersion="2015.02.27" +__ScriptVersion="2015.02.28" __ScriptName="bootstrap-salt.sh" #======================================================================================================================