db-import-*.conf: Combine mirror & mirrorpath in to ARCHMIRROR

Simpler configuration.

5 files changed, 29 insertions, 40 deletions

diff --git a/db-import-archlinux32.conf b/db-import-archlinux32.conf
index 136058b..84139d1 100644
--- a/db-import-archlinux32.conf
+++ b/db-import-archlinux32.conf
@@ -6,10 +6,8 @@ ARCHPKGPOOL='pool/archlinux32'
 # (none)
 
 ## mirrors without sources folder
-mirror="mirror.archlinux32.org"
-# mirror="32.arlm.tyzoid.com"
-
-mirrorpath="archlinux32"
+ARCHMIRROR="rsync://mirror.archlinux32.org/archlinux32"
+#ARCHMIRROR="rsync://32.arlm.tyzoid.com/archlinux32"
 
 # The followng is for db-import-archlinux32-src
 
@@ -19,6 +17,6 @@ SYNCARGS='-mrtv --no-motd --delete-after --no-p --no-o --no-g --quiet --exclude
 ABSLIBRE_ROOT='/srv/repo/db-import-archlinux32-src/abslibre'
 ABSLIBRE_GIT='https://git.parabola.nu/abslibre.git'
 ABS_ROOT='/srv/repo/db-import-archlinux32-src/abs/'
-ABS_SERVER="${mirror}/${mirrorpath}/"
+ABS_SERVER="${ARCHMIRROR#rsync://}/"
 ALARM_GIT='https://github.com/archlinux32/packages'
 ALARM_ROOT='/srv/repo/db-import-archlinux32-src/archlinux32/'
diff --git a/db-import-archlinuxarm.conf b/db-import-archlinuxarm.conf
index cf75498..37c4982 100644
--- a/db-import-archlinuxarm.conf
+++ b/db-import-archlinuxarm.conf
@@ -6,13 +6,8 @@ ARCHPKGPOOL='pool/alarm'
 # (none)
 
 ## mirrors without sources folder
-mirror="ftp.halifax.rwth-aachen.de"
-#mirror="mirror.yandex.ru"
-
-case "$mirror" in
-	mirror.yandex.ru)           mirrorpath="archlinuxarm" ;;
-	ftp.halifax.rwth-aachen.de) mirrorpath="archlinux-arm" ;;
-esac
+ARCHMIRROR="rsync://ftp.halifax.rwth-aachen.de/archlinux-arm"
+#ARCHMIRROR="rsync://mirror.yandex.ru/archlinuxarm"
 
 # The followng is for db-import-archlinuxarm-src
 
@@ -22,6 +17,6 @@ SYNCARGS='-mrtv --no-motd --delete-after --no-p --no-o --no-g --quiet --exclude
 ABSLIBRE_ROOT=/srv/repo/db-import-archlinuxarm-src/abslibre
 ABSLIBRE_GIT=https://git.parabola.nu/abslibre.git/
 ABS_ROOT='/srv/repo/db-import-archlinuxarm-src/abs/'
-ABS_SERVER="${mirror}/${mirrorpath}/"
+ABS_SERVER="${ARCHMIRROR#rsync://}/"
 ALARM_GIT='https://github.com/archlinuxarm/PKGBUILDs'
 ALARM_ROOT='/srv/repo/db-import-archlinuxarm-src/alarm/'
diff --git a/db-import-community.conf b/db-import-community.conf
index 4140da0..f88c535 100644
--- a/db-import-community.conf
+++ b/db-import-community.conf
@@ -3,18 +3,16 @@ ARCHTAGS=({community,multilib,multilib-testing}-x86_64)
 ARCHPKGPOOL='pool/community'
 ARCHSRCPOOL='sources/community'
 
-mirror="archlinux.mirror.pkern.at"
-#mirror="mirrors.kernel.org"
+ARCHMIRROR="rsync://archlinux.mirror.pkern.at/archlinux"
+#ARCHMIRROR="rsync://mirrors.kernel.org/archlinux"
 
 ## mirrors without sources folder
-#mirror="mirrors.niyawe.de"
-#mirror="mirror.nl.leaseweb.net"
-#mirror="mirror.one.com"
-#mirror="mirror.us.leaseweb.net"
-#mirror="mirror.bytemark.co.uk"
-#mirror="mirror.de.leaseweb.net"
-
-mirrorpath="archlinux"
+#ARCHMIRROR="rsync://mirrors.niyawe.de/archlinux"
+#ARCHMIRROR="rsync://mirror.nl.leaseweb.net/archlinux"
+#ARCHMIRROR="rsync://mirror.one.com/archlinux"
+#ARCHMIRROR="rsync://mirror.us.leaseweb.net/archlinux"
+#ARCHMIRROR="rsync://mirror.bytemark.co.uk/archlinux"
+#ARCHMIRROR="rsync://mirror.de.leaseweb.net/archlinux"
 
 # The followng is for db-import-archlinux-src
 
diff --git a/db-import-packages.conf b/db-import-packages.conf
index 93eab64..73d38a4 100644
--- a/db-import-packages.conf
+++ b/db-import-packages.conf
@@ -3,18 +3,16 @@ ARCHTAGS=({core,testing,extra}-x86_64)
 ARCHPKGPOOL='pool/packages'
 ARCHSRCPOOL='sources/packages'
 
-mirror="archlinux.mirror.pkern.at"
-#mirror="mirrors.kernel.org"
+ARCHMIRROR="rsync://archlinux.mirror.pkern.at/archlinux"
+#ARCHMIRROR="rsync://mirrors.kernel.org/archlinux"
 
 ## mirrors without sources folder
-#mirror="mirrors.niyawe.de"
-#mirror="mirror.nl.leaseweb.net"
-#mirror="mirror.one.com"
-#mirror="mirror.us.leaseweb.net"
-#mirror="mirror.bytemark.co.uk"
-#mirror="mirror.de.leaseweb.net"
-
-mirrorpath="archlinux"
+#ARCHMIRROR="rsync://mirrors.niyawe.de/archlinux"
+#ARCHMIRROR="rsync://mirror.nl.leaseweb.net/archlinux"
+#ARCHMIRROR="rsync://mirror.one.com/archlinux"
+#ARCHMIRROR="rsync://mirror.us.leaseweb.net/archlinux"
+#ARCHMIRROR="rsync://mirror.bytemark.co.uk/archlinux"
+#ARCHMIRROR="rsync://mirror.de.leaseweb.net/archlinux"
 
 # The followng is for db-import-archlinux-src
 
diff --git a/db-import-pkg b/db-import-pkg
index 5428b11..e19ed06 100755
--- a/db-import-pkg
+++ b/db-import-pkg
@@ -236,8 +236,8 @@ main() {
 
 	local vars
 	case "$UPSTREAM" in
-		packages|community)       vars=(mirror mirrorpath ARCHTAGS ARCHPKGPOOL ARCHSRCPOOL) ;;
-		archlinux32|archlinuxarm) vars=(mirror mirrorpath ARCHTAGS ARCHPKGPOOL            ) ;;
+		packages|community)       vars=(ARCHMIRROR ARCHTAGS ARCHPKGPOOL ARCHSRCPOOL) ;;
+		archlinux32|archlinuxarm) vars=(ARCHMIRROR ARCHTAGS ARCHPKGPOOL            ) ;;
 	esac
 	load_conf "$(dirname "$(readlink -e "$0")")/config" DBEXT FILESEXT FTP_BASE
 	load_conf "$(dirname "$(readlink -e "$0")")/db-import-${UPSTREAM}.conf" "${vars[@]}"
@@ -255,7 +255,7 @@ main() {
 	# Sync the repos databases
 	msg 'Retrieving .db and .files files'
 	mkdir "${WORKDIR}/rsync"
-	fetch_dbs "rsync://${mirror}/${mirrorpath}/" "$WORKDIR/rsync"
+	fetch_dbs "${ARCHMIRROR}/" "$WORKDIR/rsync"
 
 	##############################################################
 	# 2. Fetch the packages we want                              #
@@ -279,7 +279,7 @@ main() {
 				whitelists+=("${WORKDIR}/${reponame}-${_arch}.whitelist")
 				# Get repo packages (symlinks)
 				sync_repo \
-					"rsync://${mirror}/${mirrorpath}/${reponame}/os/${_arch}/" \
+					"${ARCHMIRROR}/${reponame}/os/${_arch}/" \
 					"${WORKDIR}/${reponame}-${_arch}.whitelist" \
 					"${FTP_BASE}/${reponame}/os/${_arch}/"
 				;;
@@ -288,7 +288,7 @@ main() {
 				filter_duplicates \
 					< "${WORKDIR}/${reponame}-${_arch}.whitelist" \
 					> "${WORKDIR}/${reponame}-${_arch}-nodups.whitelist"
-				sync_pool "rsync://${mirror}/${mirrorpath}/${_arch}/${reponame}/" \
+				sync_pool "${ARCHMIRROR}/${_arch}/${reponame}/" \
 					"${WORKDIR}/${reponame}-${_arch}-nodups.whitelist" \
 					"${FTP_BASE}/${ARCHPKGPOOL}/"
 				;;
@@ -305,13 +305,13 @@ main() {
 
 			msg "Syncing package pool"
 			sync_pool \
-				"rsync://${mirror}/${mirrorpath}/${ARCHPKGPOOL}/" \
+				"${ARCHMIRROR}}/${ARCHPKGPOOL}/" \
 				"${WORKDIR}/${UPSTREAM}-all.whitelist" \
 				"${FTP_BASE}/${ARCHPKGPOOL}/"
 
 			msg "Syncing source pool"
 			sync_pool \
-				"rsync://${mirror}/${mirrorpath}/${ARCHSRCPOOL}/" \
+				"${ARCHMIRROR}/${ARCHSRCPOOL}/" \
 				"${WORKDIR}/${UPSTREAM}-all.whitelist" \
 				"${FTP_BASE}/${ARCHSRCPOOL}/"
 			;;