From: aerique <aerique@xs4all.nl>
Date: Thu, 16 Apr 2020 12:05:05 +0000 (+0200)
Subject: Add support for dnsdist-15 to repo script.
X-Git-Tag: rec-4.4.0-alpha1~3^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fa6416e63cae325a9c9bfac47c1662e16a0757b;p=thirdparty%2Fpdns.git

Add support for dnsdist-15 to repo script.
---

diff --git a/build-scripts/docker/generate-repo-files.sh b/build-scripts/docker/generate-repo-files.sh
index 9026e32755..984b98b3ea 100755
--- a/build-scripts/docker/generate-repo-files.sh
+++ b/build-scripts/docker/generate-repo-files.sh
@@ -9,7 +9,8 @@ if [ "$1" = "" -o "$1" = "-?" -o "$1" = "-h" -o "$1" = "--help" ]; then
     echo "Usage: generate-repo-files.sh RELEASE"
     echo
     echo "  • RELEASE: [ auth-40 | auth-41 | auth-42 | auth-43 |"
-    echo "               rec-40 | rec-41 | rec-42 | rec-43 ]"
+    echo "               rec-40 | rec-41 | rec-42 | rec-43 |"
+    echo "               dnsdist-15 ]"
     exit 1
 fi
 
@@ -61,6 +62,16 @@ write_debian_or_ubuntu()
 
     cat <<EOF > pdns.list.$RELEASE.$OS-$VERSION
 deb [arch=amd64] http://repo.powerdns.com/$OS $VERSION-$RELEASE main
+EOF
+
+    # For the following two maybe only create depending on package, but
+    # it's not really a big deal.
+
+    # if not exists
+    cat <<EOF > dnsdist.debian-and-ubuntu
+Package: dnsdist*
+Pin: origin repo.powerdns.com
+Pin-Priority: 600
 EOF
 
     # if not exists
@@ -76,6 +87,7 @@ FROM $OS:$VERSION
 RUN apt-get update
 RUN apt-get install -y curl gnupg dnsutils
 
+COPY dnsdist.debian-and-ubuntu /etc/apt/preferences.d/dnsdist
 COPY pdns.debian-and-ubuntu /etc/apt/preferences.d/pdns
 COPY pdns.list.$RELEASE.$OS-$VERSION /etc/apt/sources.list.d/pdns.list
 
@@ -158,6 +170,14 @@ elif [ "$RELEASE" = "rec-42" -o "$RELEASE" = "rec-43" ]; then
     write_debian buster pdns-recursor pdns_recursor
     write_ubuntu xenial pdns-recursor pdns_recursor
     write_ubuntu bionic pdns-recursor pdns_recursor
+elif [ "$RELEASE" = "dnsdist-15" ]; then
+    write_centos 6 dnsdist dnsdist
+    write_centos 7 dnsdist dnsdist
+    write_centos 8 dnsdist dnsdist
+    write_debian stretch dnsdist dnsdist
+    write_debian buster dnsdist dnsdist
+    write_ubuntu xenial dnsdist dnsdist
+    write_ubuntu bionic dnsdist dnsdist
 else
     echo "Invalid release: $RELEASE"
     exit 1