From 4c94e164c4b84f640cde0531be9ecfefe41801de Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 14 Feb 2017 17:59:02 -0500
Subject: config: sane-ify paths

---
 config                      |  8 ++++----
 cron-jobs/db-cleanup.conf   | 26 +++++++++++++++++---------
 db-import-archlinuxarm.conf |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/config b/config
index 6aad16b..9796411 100644
--- a/config
+++ b/config
@@ -14,15 +14,15 @@ PKGREPOS=(
 	'nonprism-multilib-testing' 'pcr' 'pcr-testing' 'pcr-multilib'
 	'pcr-multilib-testing' 'pcr-testing' 'kernels' 'kernels-testing'
 	'cross' 'java' 'unmaintained')
-PKGPOOL='pool/parabola_gnu+linux'
-SRCPOOL='src/parabola_gnu+linux'
+PKGPOOL='pool/parabola'
+SRCPOOL='sources/parabola'
 
-CLEANUP_DESTDIR="$FTP_BASE/old/pkg"
+CLEANUP_DESTDIR="/srv/repo/package-cleanup"
 CLEANUP_DRYRUN=false
 # Time in days to keep moved packages
 CLEANUP_KEEP=30
 
-SOURCE_CLEANUP_DESTDIR="$FTP_BASE/old/src"
+SOURCE_CLEANUP_DESTDIR="/srv/repo/source-cleanup"
 SOURCE_CLEANUP_DRYRUN=true
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP=30
diff --git a/cron-jobs/db-cleanup.conf b/cron-jobs/db-cleanup.conf
index 7c2344c..b8d5b86 100644
--- a/cron-jobs/db-cleanup.conf
+++ b/cron-jobs/db-cleanup.conf
@@ -1,11 +1,19 @@
+#!/hint/bash
+
+# Both PKGPOOLS and SRCPOOLS are relative to `config:FTP_BASE`.
+
 # Directories where packages are shared between repos
-# *relative to FTP_BASE*
-PKGPOOLS=(pool/parabola_gnu+linux # Parabola GNU/Linux-libre
-	  pool/arch_gnu+linux_arm # Arch Linux ARM
-	  pool/{packages,community} # Arch Linux
-	 )
+PKGPOOLS=(
+	pool/parabola  # Parabola GNU/Linux-libre
+	pool/alarm     # Arch Linux ARM
+	pool/packages  # Arch Linux (project)
+	pool/community # Arch Linux (community)
+)
+
 # Directories where sources are stored
-SRCPOOLS=(src/parabola_gnu+linux # Parabola GNU/Linux-libre
-	  src/arch_gnu+linux_arm # Arch Linux ARM
-	  sources/{packages,community} # Arch Linux
-	 )
+SRCPOOLS=(
+	sources/parabola  # Parabola GNU/Linux-libre
+	sources/alarm     # Arch Linux ARM
+	sources/packages  # Arch Linux (project)
+	sources/community # Arch Linux (community)
+)
diff --git a/db-import-archlinuxarm.conf b/db-import-archlinuxarm.conf
index 39dc0a4..cce19a7 100644
--- a/db-import-archlinuxarm.conf
+++ b/db-import-archlinuxarm.conf
@@ -1,5 +1,5 @@
 ARMREPOS=('core' 'extra' 'community')
-PKGPOOLARM='pool/arch_gnu+linux_arm'
+PKGPOOLARM='pool/alarm'
 OURARCHES=(armv7h)
 
 #mirror="mirror.yandex.ru"
-- 
cgit v1.2.3