From a8af6a161b2e1dc562413d1e396ec8a84cc5fc0a Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Mon, 22 Apr 2024 17:41:01 +0200 Subject: [PATCH 1/9] shebang --- bootstrap.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bootstrap.sh b/bootstrap.sh index dd40508..f17b299 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -1,3 +1,4 @@ +#! /usr/bin/env bash FILE="$(realpath "${BASH_SOURCE[0]}")" ROOT="$(dirname "${FILE}")" From fb20e3219c4c8ef025b5e4256b896fc184ea6e8c Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 25 Apr 2024 10:15:18 +0200 Subject: [PATCH 2/9] =?UTF-8?q?=E2=88=92remove?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bootstrap.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index f17b299..cefdc08 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -41,6 +41,3 @@ echo "${SERVER} ssh-${KEY_ALGORITHM} ${KEY_PUBLIC}" \ # packages apt-get install --yes "${PACKAGES[@]}" \ || exit - -# remove -rm --force --recursive "${ROOT}" From 4a3a8fb9aa4211016b68b9f19c87132e6661ae41 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 25 Apr 2024 10:23:23 +0200 Subject: [PATCH 3/9] python --- bootstrap.sh | 1 - cd.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index cefdc08..e6a0466 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -9,7 +9,6 @@ KEY_PATH="${KEY_DIRECTORY}/id_${KEY_ALGORITHM}" KEY_PUBLIC='AAAAC3NzaC1lZDI1NTE5AAAAIPHCNcgHlQoiNTXfnUZYvHz9OZwYsmBCrSSV7a7Zche5' PACKAGES=( 'openssh-client' -'python3' 'rsync' 'tree' ) diff --git a/cd.sh b/cd.sh index 3dae9f5..9441a45 100644 --- a/cd.sh +++ b/cd.sh @@ -4,6 +4,7 @@ NAMESERVERS=( PACKAGES=( 'ca-certificates' 'git' +'python3' ) REPOSITORY='rwx.work/cd' From e3822371ae8eb2ee15ce8f3078b991b1cdcf0b28 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 25 Apr 2024 15:30:32 +0200 Subject: [PATCH 4/9] sources --- cd.sh | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index 9441a45..b39b704 100644 --- a/cd.sh +++ b/cd.sh @@ -2,33 +2,83 @@ NAMESERVERS=( '9.9.9.9' ) PACKAGES=( -'ca-certificates' 'git' 'python3' ) REPOSITORY='rwx.work/cd' +echo ' + 1/11 set name servers +' for nameserver in "${NAMESERVERS[@]}" ; do echo "nameserver ${nameserver}" \ >> '/etc/resolv.conf' \ || exit done +echo ' + 2/11 configure package manager +' echo -n "\ APT::Get::Show-Versions True; APT::Install-Recommends False; APT::Install-Suggests False; " > '/etc/apt/apt.conf.d/apt.conf' \ || exit +echo ' + 3/11 configure package repositories +' +echo -n "\ +deb https://deb.debian.org/debian bookworm main +deb https://deb.debian.org/debian-backports bookworm main +deb https://deb.debian.org/debian-updates bookworm main +deb https://deb.debian.org/debian-security bookworm-security main +" > '/etc/apt/sources.list' \ +|| exit + +echo ' + 4/11 update package catalog +' apt-get update \ || exit -apt-get install --yes "${PACKAGES[@]}" \ +echo ' + 5/11 install CA certificates package +' +apt-get install --yes 'ca-certificates' \ +|| exit +echo ' + 6/11 update package catalog +' +apt-get update \ +|| exit +echo ' + 7/11 upgrade packages +' +apt-get upgrade --yes \ +|| exit + +echo ' + 8/11 install Git +' +apt-get install --yes 'git' \ || exit DIRECTORY="$(mktemp --directory)" \ || exit +echo ' + 9/11 clone Continuous Delivery +' git clone \ "${GITHUB_SERVER_URL}/${REPOSITORY}" \ "${DIRECTORY}" \ || exit + +echo ' +10/11 install Python +' +apt-get install --yes 'python3' \ +|| exit +echo ' +11/11 bootstrap +' "${DIRECTORY}/bootstrap.sh" From eece37decada4945294434507d28a6d4f03520f5 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 25 Apr 2024 15:31:20 +0200 Subject: [PATCH 5/9] packages --- cd.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cd.sh b/cd.sh index b39b704..1880d9a 100644 --- a/cd.sh +++ b/cd.sh @@ -1,10 +1,6 @@ NAMESERVERS=( '9.9.9.9' ) -PACKAGES=( -'git' -'python3' -) REPOSITORY='rwx.work/cd' echo ' From e893426333a43ecac3bbda8baab211d10ab499e0 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 25 Apr 2024 15:33:58 +0200 Subject: [PATCH 6/9] apt --- cd.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cd.sh b/cd.sh index 1880d9a..4121f9a 100644 --- a/cd.sh +++ b/cd.sh @@ -16,9 +16,11 @@ echo ' 2/11 configure package manager ' echo -n "\ +Acquire::Check-Valid-Until True; APT::Get::Show-Versions True; APT::Install-Recommends False; APT::Install-Suggests False; +Dir::Etc::SourceParts ''; " > '/etc/apt/apt.conf.d/apt.conf' \ || exit echo ' @@ -26,8 +28,8 @@ echo ' ' echo -n "\ deb https://deb.debian.org/debian bookworm main -deb https://deb.debian.org/debian-backports bookworm main -deb https://deb.debian.org/debian-updates bookworm main +deb https://deb.debian.org/debian bookworm-backports main +deb https://deb.debian.org/debian bookworm-updates main deb https://deb.debian.org/debian-security bookworm-security main " > '/etc/apt/sources.list' \ || exit From aa6decf3a8183b85afcf41b6af68bcebbdb928a2 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 25 Apr 2024 15:38:28 +0200 Subject: [PATCH 7/9] clean --- cd.sh | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/cd.sh b/cd.sh index 4121f9a..1ebbe9e 100644 --- a/cd.sh +++ b/cd.sh @@ -4,7 +4,7 @@ NAMESERVERS=( REPOSITORY='rwx.work/cd' echo ' - 1/11 set name servers + 1/12 set name servers ' for nameserver in "${NAMESERVERS[@]}" ; do echo "nameserver ${nameserver}" \ @@ -13,7 +13,7 @@ for nameserver in "${NAMESERVERS[@]}" ; do done echo ' - 2/11 configure package manager + 2/12 configure package manager ' echo -n "\ Acquire::Check-Valid-Until True; @@ -24,7 +24,7 @@ Dir::Etc::SourceParts ''; " > '/etc/apt/apt.conf.d/apt.conf' \ || exit echo ' - 3/11 configure package repositories + 3/12 configure package repositories ' echo -n "\ deb https://deb.debian.org/debian bookworm main @@ -35,28 +35,28 @@ deb https://deb.debian.org/debian-security bookworm-security main || exit echo ' - 4/11 update package catalog + 4/12 update package catalog ' apt-get update \ || exit echo ' - 5/11 install CA certificates package + 5/12 install CA certificates package ' apt-get install --yes 'ca-certificates' \ || exit echo ' - 6/11 update package catalog + 6/12 update package catalog ' apt-get update \ || exit echo ' - 7/11 upgrade packages + 7/12 upgrade packages ' apt-get upgrade --yes \ || exit echo ' - 8/11 install Git + 8/12 install Git ' apt-get install --yes 'git' \ || exit @@ -64,7 +64,7 @@ apt-get install --yes 'git' \ DIRECTORY="$(mktemp --directory)" \ || exit echo ' - 9/11 clone Continuous Delivery + 9/12 clone Continuous Delivery ' git clone \ "${GITHUB_SERVER_URL}/${REPOSITORY}" \ @@ -72,11 +72,16 @@ git clone \ || exit echo ' -10/11 install Python +10/12 install Python ' apt-get install --yes 'python3' \ || exit echo ' -11/11 bootstrap +11/12 clean package cache +' +apt-get clean \ +|| exit +echo ' +12/12 bootstrap ' "${DIRECTORY}/bootstrap.sh" From 779cf7f220535b13118fa30c80e0e7d542f2b8e8 Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 25 Apr 2024 16:01:18 +0200 Subject: [PATCH 8/9] " --- cd.sh | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/cd.sh b/cd.sh index 1ebbe9e..35d3c14 100644 --- a/cd.sh +++ b/cd.sh @@ -3,18 +3,18 @@ NAMESERVERS=( ) REPOSITORY='rwx.work/cd' -echo ' +echo " 1/12 set name servers -' +" for nameserver in "${NAMESERVERS[@]}" ; do echo "nameserver ${nameserver}" \ >> '/etc/resolv.conf' \ || exit done -echo ' +echo " 2/12 configure package manager -' +" echo -n "\ Acquire::Check-Valid-Until True; APT::Get::Show-Versions True; @@ -23,9 +23,9 @@ APT::Install-Suggests False; Dir::Etc::SourceParts ''; " > '/etc/apt/apt.conf.d/apt.conf' \ || exit -echo ' +echo " 3/12 configure package repositories -' +" echo -n "\ deb https://deb.debian.org/debian bookworm main deb https://deb.debian.org/debian bookworm-backports main @@ -34,54 +34,54 @@ deb https://deb.debian.org/debian-security bookworm-security main " > '/etc/apt/sources.list' \ || exit -echo ' +echo " 4/12 update package catalog -' +" apt-get update \ || exit -echo ' +echo " 5/12 install CA certificates package -' +" apt-get install --yes 'ca-certificates' \ || exit -echo ' +echo " 6/12 update package catalog -' +" apt-get update \ || exit -echo ' +echo " 7/12 upgrade packages -' +" apt-get upgrade --yes \ || exit -echo ' +echo " 8/12 install Git -' +" apt-get install --yes 'git' \ || exit DIRECTORY="$(mktemp --directory)" \ || exit -echo ' +echo " 9/12 clone Continuous Delivery -' +" git clone \ "${GITHUB_SERVER_URL}/${REPOSITORY}" \ "${DIRECTORY}" \ || exit -echo ' +echo " 10/12 install Python -' +" apt-get install --yes 'python3' \ || exit -echo ' +echo " 11/12 clean package cache -' +" apt-get clean \ || exit -echo ' +echo " 12/12 bootstrap -' +" "${DIRECTORY}/bootstrap.sh" From c99b6dedbc188fafc11032321bd6159f82bc516f Mon Sep 17 00:00:00 2001 From: Marc Beninca Date: Thu, 25 Apr 2024 16:10:57 +0200 Subject: [PATCH 9/9] https --- cd.sh | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-) diff --git a/cd.sh b/cd.sh index 35d3c14..c362a84 100644 --- a/cd.sh +++ b/cd.sh @@ -4,7 +4,7 @@ NAMESERVERS=( REPOSITORY='rwx.work/cd' echo " - 1/12 set name servers + 1/14 set name servers " for nameserver in "${NAMESERVERS[@]}" ; do echo "nameserver ${nameserver}" \ @@ -13,7 +13,7 @@ for nameserver in "${NAMESERVERS[@]}" ; do done echo " - 2/12 configure package manager + 2/14 configure package manager " echo -n "\ Acquire::Check-Valid-Until True; @@ -24,7 +24,7 @@ Dir::Etc::SourceParts ''; " > '/etc/apt/apt.conf.d/apt.conf' \ || exit echo " - 3/12 configure package repositories + 3/14 configure package repositories " echo -n "\ deb https://deb.debian.org/debian bookworm main @@ -35,28 +35,41 @@ deb https://deb.debian.org/debian-security bookworm-security main || exit echo " - 4/12 update package catalog + 4/14 disable package verification +" +echo -n "\ +Acquire::https::Verify-Peer False; +" > '/etc/apt/apt.conf.d/https' \ +|| exit +echo " + 5/14 update package catalog " apt-get update \ || exit echo " - 5/12 install CA certificates package + 6/14 install CA certificates package " apt-get install --yes 'ca-certificates' \ || exit echo " - 6/12 update package catalog + 7/14 enable package verification +" +rm '/etc/apt/apt.conf.d/https' \ +|| exit + +echo " + 8/14 update package catalog " apt-get update \ || exit echo " - 7/12 upgrade packages + 9/14 upgrade packages " apt-get upgrade --yes \ || exit echo " - 8/12 install Git +10/14 install Git " apt-get install --yes 'git' \ || exit @@ -64,7 +77,7 @@ apt-get install --yes 'git' \ DIRECTORY="$(mktemp --directory)" \ || exit echo " - 9/12 clone Continuous Delivery +11/14 clone Continuous Delivery " git clone \ "${GITHUB_SERVER_URL}/${REPOSITORY}" \ @@ -72,16 +85,16 @@ git clone \ || exit echo " -10/12 install Python +12/14 install Python " apt-get install --yes 'python3' \ || exit echo " -11/12 clean package cache +13/14 clean package cache " apt-get clean \ || exit echo " -12/12 bootstrap +14/14 bootstrap " "${DIRECTORY}/bootstrap.sh"