Remove db-sync and friends. Simplify the config accordingly

1 files changed, 15 insertions, 23 deletions

diff --git a/config b/config
index e43c13d..87fbf2d 100644
--- a/config
+++ b/config
@@ -2,29 +2,26 @@
 FTP_BASE="/srv/http/repo/public"
 SVNREPO="/var/abs"
 
-# Repos from Arch
-ARCHREPOS=('core' 'testing' 'extra' 'community' 'multilib' 'multilib-testing')
 TESTING_REPO='testing'
-# 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=('pcr' 'kernels' 'cross' 'java' 'nonprism')
-# Remote repos
-PKGREPOS=("${ARCHREPOS[@]}" "${OURREPOS[@]}" "${USERREPOS[@]}" "${PROJREPOS[@]}")
+PKGREPOS=(
+	# Arch
+	{core,extra,testing,staging}
+	{gnome,kde}-unstable
+	{community,multilib}{,-testing,-staging}
+	# Parabola
+	libre{,-testing}
+	libre-multilib{,-testing}
+	pcr kernels cross java nonprism
+	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan')
+)
 PKGPOOL='pool/parabola'
 SRCPOOL='sources/parabola'
 
 # Directories where packages are shared between repos
 # *relative to FTP_BASE*
-ARCHPKGPOOLS=(pool/{packages,community})
-OURPKGPOOLS=(pool/parabola)
-PKGPOOLS=(${OURPKGPOOLS[@]} ${ARCHPKGPOOLS[@]})
+PKGPOOLS=(pool/{packages,community,parabola})
 # Directories where sources are stored
-ARCHSRCPOOLS=(sources/{packages,community})
-OURPKGPOOLS=(sources/parabola)
-SRCPOOLS=(${OURSRCPOOLS[@]} ${ARCHSRCPOOLS[@]})
+SRCPOOLS=(sources/{packages,community,parabola})
 
 CLEANUP_DESTDIR="$FTP_BASE/old/packages"
 CLEANUP_DRYRUN=false
@@ -43,16 +40,11 @@ LOCK_TIMEOUT=300
 
 [ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging"
 TMPDIR="/tmp"
-ARCHARCHES=(i686 x86_64)
-OURARCHES=(mips64el)
-ARCHES=(${ARCHARCHES[@]} ${OURARCHES[@]})
+ARCHES=(i686 x86_64 mips64el)
 DBEXT=".db.tar.gz"
 FILESEXT=".files.tar.gz"
 PKGEXT=".pkg.tar.xz"
 SRCEXT=".src.tar.gz"
 
+# Used by cron-jobs/sourceballs2
 MAKEPKGCONF="~/.makepkg.conf"
-BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
-
-# parabolaweb root
-WEB_DIR=/srv/http/parabolagnulinux.org/web