summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHerman van Rink2019-02-25 12:17:14 (GMT)
committerHerman van Rink2019-02-25 12:17:14 (GMT)
commit6177eedb8a4d97166ddb10f4b986f8bea9da01ed (patch)
tree4722aa2e6baa0b21b6eb57189dce1e6433f17777
parent691d90414ac1b0da5aca72a23526d4f2d654e25b (diff)
resuce delta in ci scripts
-rw-r--r--scripts/ci-aegir-stable-install-apt-debian10.sh3
-rwxr-xr-xscripts/ci-aegir-stable-install-apt-debian9.sh8
2 files changed, 4 insertions, 7 deletions
diff --git a/scripts/ci-aegir-stable-install-apt-debian10.sh b/scripts/ci-aegir-stable-install-apt-debian10.sh
index 3fc790c..280b209 100644
--- a/scripts/ci-aegir-stable-install-apt-debian10.sh
+++ b/scripts/ci-aegir-stable-install-apt-debian10.sh
@@ -17,12 +17,11 @@ sudo apt-get install --yes mariadb-server
sudo /usr/bin/mysql -e "GRANT ALL ON *.* TO 'aegir_root'@'localhost' IDENTIFIED BY 'PASSWORD' WITH GRANT OPTION"
-debconf-set-selections <<EOF
+sudo debconf-set-selections <<EOF
aegir3-hostmaster aegir/email string aegir@example.com
aegir3-hostmaster aegir/site string aegir.example.com
postfix postfix/main_mailer_type select Local only
EOF
-
sudo DPKG_DEBUG=developer apt-get install --yes aegir3
diff --git a/scripts/ci-aegir-stable-install-apt-debian9.sh b/scripts/ci-aegir-stable-install-apt-debian9.sh
index f5b6ee4..11414a3 100755
--- a/scripts/ci-aegir-stable-install-apt-debian9.sh
+++ b/scripts/ci-aegir-stable-install-apt-debian9.sh
@@ -5,10 +5,10 @@
#
-sudo apt-get install --yes curl
+sudo apt-get install --yes wget
-echo "deb http://debian.aegirproject.org stable main" | sudo tee -a /etc/apt/sources.list.d/aegir-stable.list
-curl https://debian.aegirproject.org/key.asc | sudo apt-key add -
+sudo wget -O /usr/share/keyrings/aegir-archive-keyring.gpg https://debian.aegirproject.org/aegir-archive-keyring.gpg
+echo "deb [signed-by=/usr/share/keyrings/aegir-archive-keyring.gpg] https://debian.aegirproject.org stable main" | sudo tee -a /etc/apt/sources.list.d/aegir-stable.list
sudo apt-get update
echo "debconf debconf/frontend select Noninteractive" | sudo debconf-set-selections
@@ -29,5 +29,3 @@ postfix postfix/main_mailer_type select Local only
EOF
sudo DPKG_DEBUG=developer apt-get install --yes aegir3
-
-