clean up config

2 files changed, 35 insertions, 20 deletions

diff --git a/config b/config
index 77df26f..fff797d 100644
--- a/config
+++ b/config
@@ -1,7 +1,6 @@
-#!/bin/bash # as a hint to text editors
-FTP_BASE="/srv/http/repo/public"
+#!/bin/bash # non-executable, but put this there as a hint to text editors
 
-TESTING_REPO='testing'
+FTP_BASE="/srv/http/repo/public"
 PKGREPOS=(
 	# Arch
 	{core,extra,testing,staging}
@@ -11,24 +10,29 @@ PKGREPOS=(
 	libre{,-testing}
 	libre-multilib{,-testing}
 	pcr kernels cross java nonprism
-	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan')
+	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan'
 )
 PKGPOOL='pool/parabola'
 SRCPOOL='sources/parabola'
+TESTING_REPO='testing'
+STABLE_REPOS=(
+	# Arch
+	{core,extra}
+	{community,multilib}
+	# Parabola
+	libre
+	libre-multilib
+	pcr kernels cross java nonprism
+	'~smv' '~xihh' '~brendan' '~lukeshu' '~emulatorman' '~aurelien' '~jorginho' '~coadde' '~drtan'
+)
 
-# Directories where packages are shared between repos
-# *relative to FTP_BASE*
-PKGPOOLS=(pool/{packages,community,parabola})
-# Directories where sources are stored
-SRCPOOLS=(sources/{packages,community,parabola})
-
-CLEANUP_DESTDIR="$FTP_BASE/old/packages"
+CLEANUP_DESTDIR="/srv/http/repo/private/cleanup-destdir"
 CLEANUP_DRYRUN=false
 # Time in days to keep moved packages
 CLEANUP_KEEP=30
 
-SOURCE_CLEANUP_DESTDIR="$FTP_BASE/old/sources"
-SOURCE_CLEANUP_DRYRUN=true
+SOURCE_CLEANUP_DESTDIR="/srv/http/repo/private/source-cleanup-destdir"
+SOURCE_CLEANUP_DRYRUN=false
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP=30
 
@@ -38,12 +42,24 @@ LOCK_DELAY=10
 LOCK_TIMEOUT=300
 
 [ -n "${STAGING:-}" ] || STAGING="$HOME/staging/unknown/staging"
-TMPDIR="/tmp"
+export TMPDIR="${TMPDIR:-/tmp}"
 ARCHES=(i686 x86_64 mips64el)
 DBEXT=".db.tar.gz"
 FILESEXT=".files.tar.gz"
-PKGEXT=".pkg.tar.xz"
+PKGEXT=".pkg.tar.?z"
 SRCEXT=".src.tar.gz"
 
-# Used by cron-jobs/sourceballs2
-MAKEPKGCONF="~/.makepkg.conf"
+# Allowed licenses: get sourceballs only for licenses in this array
+# Empty (commented out) to get sourceballs for all packages
+#ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2' 'LGPL2.1')
+
+# For db-cleanup
+PKGPOOLS=(pool/{packages,community,parabola})
+SRCPOOLS=(sources/{packages,community,parabola})
+
+# Where to send error emails, and who they are from
+LIST="dev@lists.parabolagnulinux.org"
+FROM="dbscripts+$(whoami)@$(hostname -f)"
+
+# Override default config with config.local
+[ -f "$(dirname "${BASH_SOURCE[0]}")/config.local" ] && . "$(dirname "${BASH_SOURCE[0]}")/config.local"
diff --git a/cron-jobs/devlist-mailer b/cron-jobs/devlist-mailer
index 1a05521..cede4fc 100755
--- a/cron-jobs/devlist-mailer
+++ b/cron-jobs/devlist-mailer
@@ -2,9 +2,8 @@
 #Dummy helper to send email to arch-dev
 # It does nothing if no output
 
-LIST="arch-dev-public@archlinux.org"
-#LIST="aaronmgriffin@gmail.com"
-FROM="repomaint@archlinux.org"
+# Load $LIST and $FROM from the config file
+source "$(dirname "$(readlink -e "$0")")/../config"
 
 SUBJECT="Repository Maintenance $(date +"%d-%m-%Y")"
 if [ $# -ge 1 ]; then