Clean up the config files.

7 files changed, 36 insertions, 31 deletions

diff --git a/config b/config
index f41e6f6..38cdae5 100644
--- a/config
+++ b/config
@@ -1,33 +1,30 @@
 #!/hint/bash
+# Please try to refrain from adding new variables to this file.
+# Instead, create separate ${toolname}.conf files.  Only add a
+# variable here if multiple tools start needing the option.
 
 FTP_BASE="/srv/repo/main"
 
-# Repos from Arch
-ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing')
-ARMREPOS=('core' 'extra' 'community')
-# Official Parabola repos
-OURREPOS=('libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing')
-# User repos
-USERREPOS=('~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan')
-# Community project repos
-PROJREPOS=('nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java')
-# Remote repos
-PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
+PKGREPOS=(
+	'core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing'
+	'libre' 'libre-testing' 'libre-multilib' 'libre-multilib-testing'
+	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan'
+	'nonsystemd' 'nonsystemd-testing' 'nonprism' 'nonprism-testing' 'pcr' 'kernels' 'cross' 'java')
 PKGPOOL='pool/parabola_gnu+linux'
-PKGPOOLARM='pool/arch_gnu+linux_arm'
 SRCPOOL='src/parabola_gnu+linux'
 
 # Directories where packages are shared between repos
 # *relative to FTP_BASE*
-ARCHPKGPOOLS=(pool/{packages,community})
-ARMPKGPOOLS=(pool/arch_gnu+linux_arm)
-OURPKGPOOLS=(pool/parabola_gnu+linux)
-PKGPOOLS=(${OURPKGPOOLS[@]} ${ARMPKGPOOLS[@]} ${ARCHPKGPOOLS[@]})
+PKGPOOLS=(pool/parabola_gnu+linux # Parabola GNU/Linux-libre
+	  pool/arch_gnu+linux_arm # Arch Linux ARM
+	  pool/{packages,community} # Arch Linux
+	 )
 # Directories where sources are stored
-ARCHSRCPOOLS=(sources/{packages,community})
-ARMSRCPOOLS=(src/arch_gnu+linux_arm)
-OURPKGPOOLS=(src/parabola_gnu+linux)
-SRCPOOLS=(${OURSRCPOOLS[@]} ${ARMSRCPOOLS[@]} ${ARCHSRCPOOLS[@]})
+OURPKGPOOLS=(
+SRCPOOLS=(src/parabola_gnu+linux # Parabola GNU/Linux-libre
+	  src/arch_gnu+linux_arm # Arch Linux ARM
+	  sources/{packages,community} # Arch Linux
+	 )
 
 CLEANUP_DESTDIR="$FTP_BASE/old/pkg"
 CLEANUP_DRYRUN=false
@@ -42,20 +39,11 @@ SOURCE_CLEANUP_KEEP=30
 REQUIRE_SIGNATURE=true
 
 LOCK_DELAY=10
-LOCK_TIMEOUT=300
 
 [ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging"
 TMPDIR="/tmp"
-ARCHARCHES=(i686 x86_64)
-OURARCHES=(armv7h)
-ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]})
+ARCHES=(i686 x86_64 armv7h)
 DBEXT=".db.tar.gz"
 FILESEXT=".files.tar.gz"
 PKGEXT=".pkg.tar.?z"
 SRCEXT=".src.tar.gz"
-
-MAKEPKGCONF="~/.makepkg.conf"
-BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
-
-# parabolaweb root
-WEB_DIR=/srv/http/parabola.nu/web
diff --git a/db-check-nonfree b/db-check-nonfree
index 37b7cf6..ea123fa 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 . "$(dirname "$(readlink -e "$0")")/config"
+. "$(dirname "$(readlink -e "$0")")/db-check-nonfree.conf"
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -ge 1 ]; then
diff --git a/db-check-nonfree.conf b/db-check-nonfree.conf
new file mode 100644
index 0000000..ea3330c
--- /dev/null
+++ b/db-check-nonfree.conf
@@ -0,0 +1 @@
+BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
diff --git a/db-import-any-to-ours b/db-import-any-to-ours
index 8a4e874..10df57d 100755
--- a/db-import-any-to-ours
+++ b/db-import-any-to-ours
@@ -8,6 +8,7 @@ trap_exit() {
 }
 
 source "$(dirname "$(readlink -e "$0")")/config"
+source "$(dirname "$(readlink -e "$0")")/db-import-pkg-archlinux.conf"
 source "$(librelib messages)"
 
 # From makepkg
diff --git a/db-import-pkg-archlinux.conf b/db-import-pkg-archlinux.conf
index 24fc44d..525fc58 100644
--- a/db-import-pkg-archlinux.conf
+++ b/db-import-pkg-archlinux.conf
@@ -1,3 +1,11 @@
+ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing')
+ARCHPKGPOOLS=(pool/{packages,community})
+ARCHSRCPOOLS=(sources/{packages,community})
+ARCHARCHES=(i686 x86_64)
+OURARCHES=(armv7h)
+
+BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
+
 mirror="mirrors.kernel.org"
 
 ## mirrors without sources folder
diff --git a/db-import-pkg-archlinuxarm b/db-import-pkg-archlinuxarm
index a512278..536b603 100755
--- a/db-import-pkg-archlinuxarm
+++ b/db-import-pkg-archlinuxarm
@@ -189,7 +189,7 @@ source "$(dirname "$(readlink -e "$0")")/db-import-pkg-archlinuxarm.conf"
 source "$(librelib messages)"
 
 # Check variables presence
-for var in DBEXT FILESEXT mirror mirrorpath WORKDIR BLACKLIST_FILE FTP_BASE ARCHSRCPOOLS ARCHPKGPOOLS; do
+for var in DBEXT FILESEXT mirror mirrorpath WORKDIR BLACKLIST_FILE FTP_BASE; do
 	test -z "${!var}" && fatal_error "Empty %s" "${var}"
 done
 
diff --git a/db-import-pkg-archlinuxarm.conf b/db-import-pkg-archlinuxarm.conf
index eaa170f..4a12a25 100644
--- a/db-import-pkg-archlinuxarm.conf
+++ b/db-import-pkg-archlinuxarm.conf
@@ -1,3 +1,9 @@
+ARMREPOS=('core' 'extra' 'community')
+PKGPOOLARM='pool/arch_gnu+linux_arm'
+OURARCHES=(armv7h)
+
+BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
+
 #mirror="mirror.yandex.ru"
 mirror="ftp.halifax.rwth-aachen.de"