From de330518db13ca0a6bb9d0a4227f842d2a8ca941 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sun, 17 May 2015 21:20:56 -0400
Subject: clean up configuration

---
 config                        |  8 ++++----
 config.local.import-community |  2 ++
 config.local.import-packages  |  2 ++
 config.local.parabola         |  2 ++
 db-import.conf                | 20 +++++++++++++-------
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/config b/config
index 51d89ea..f494a53 100644
--- a/config
+++ b/config
@@ -1,4 +1,4 @@
-#!/bin/bash # non-executable, but put this there as a hint to text editors
+#!/hint/bash
 
 case "$USER" in
 	db-import-packages) _name=import-packages;;
@@ -11,12 +11,12 @@ PKGREPOS=()
 PKGPOOL=''
 SRCPOOL=''
 
-CLEANUP_DESTDIR="/srv/http/repo/private/${_name}/package-cleanup"
+CLEANUP_DESTDIR="/srv/repo/private/${_name}/package-cleanup"
 CLEANUP_DRYRUN=false
 # Time in days to keep moved packages
 CLEANUP_KEEP=30
 
-SOURCE_CLEANUP_DESTDIR="/srv/http/repo/private/${_name}/source-cleanup"
+SOURCE_CLEANUP_DESTDIR="/srv/repo/private/${_name}/source-cleanup"
 SOURCE_CLEANUP_DRYRUN=false
 # Time in days to keep moved sourcepackages
 SOURCE_CLEANUP_KEEP=14
@@ -39,7 +39,7 @@ SRCEXT=".src.tar.gz"
 #ALLOWED_LICENSES=('GPL' 'GPL1' 'GPL2' 'LGPL' 'LGPL1' 'LGPL2' 'LGPL2.1')
 
 # Where to send error emails, and who they are from
-LIST="dev@lists.parabolagnulinux.org"
+LIST="dev@lists.parabola.nu"
 FROM="dbscripts+${_name}@$(hostname -f)"
 
 # Override default config with config.local
diff --git a/config.local.import-community b/config.local.import-community
index 63f4d2f..393fd57 100644
--- a/config.local.import-community
+++ b/config.local.import-community
@@ -1,3 +1,5 @@
+#!/hint/bash
+
 PKGREPOS=({community,multilib}{,-testing,-staging})
 PKGPOOL='pool/community'
 SRCPOOL='sources/community'
diff --git a/config.local.import-packages b/config.local.import-packages
index 432b3ab..c699b28 100644
--- a/config.local.import-packages
+++ b/config.local.import-packages
@@ -1,3 +1,5 @@
+#!/hint/bash
+
 PKGREPOS=('core' 'extra' 'testing' 'staging' {kde,gnome}-unstable)
 PKGPOOL='pool/packages'
 SRCPOOL='sources/packages'
diff --git a/config.local.parabola b/config.local.parabola
index b96f801..648dfbb 100644
--- a/config.local.parabola
+++ b/config.local.parabola
@@ -1,3 +1,5 @@
+#!/hint/bash
+
 PKGREPOS=(
 	# Main repos
 	libre{,-testing}
diff --git a/db-import.conf b/db-import.conf
index 4330fa9..aaf7b0f 100644
--- a/db-import.conf
+++ b/db-import.conf
@@ -1,13 +1,19 @@
-#/bin/bash # as a hint to text editors
+#!/hint/bash
 
 IMPORTDIR=/srv/repo/import
 
-_archrepos=(
-	{core,extra,testing,staging}-{i686,x86_64}
-	{gnome,kde}-unstable-{i686,x86_64}
-	community{,-testing,-staging}-{i686,x86_64}
-	multilib{,-testing,-staging}-x86_64
-)
+case "$USER" in
+	db-import-packages)
+		_archrepos=(
+			{core,extra,testing,staging}-{i686,x86_64}
+			{gnome,kde}-unstable-{i686,x86_64}
+		);;
+	db-import-community)
+		_archrepos=(
+			community{,-testing,-staging}-{i686,x86_64}
+			multilib{,-testing,-staging}-x86_64
+		);;
+esac
 
 _archpkgmirror=$(db-pick-mirror rsync https://www.archlinux.org/mirrors/status/tier/1/json/)
 
-- 
cgit v1.2.3-2-g168b