Simplify repo configuration

* Repositories can now be defined in the config file for each host
* added community-staging, gnome-unstable and kde-unstable
* Exception is the adjust-permission cron-job; but we might want to use acls in future anyway
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>

4 files changed, 9 insertions, 5 deletions

diff --git a/cron-jobs/adjust-permissions b/cron-jobs/adjust-permissions
index a68584c..e0b6e4e 100755
--- a/cron-jobs/adjust-permissions
+++ b/cron-jobs/adjust-permissions
@@ -15,10 +15,16 @@ get_dir_owner() {
 			echo "ftp:ftp-extra" ;;
 		staging)
 			echo "ftp:ftp-extra" ;;
+		kde-unstable)
+			echo "ftp:ftp-extra" ;;
+		gnome-unstable)
+			echo "ftp:ftp-extra" ;;
 		community)
 			echo "root:tusers" ;;
 		community-testing)
 			echo "root:tusers" ;;
+		community-staging)
+			echo "root:tusers" ;;
 		multilib)
 			echo "root:multilib" ;;
 		pool/packages)
diff --git a/cron-jobs/create-filelists b/cron-jobs/create-filelists
index e280f84..a37080f 100755
--- a/cron-jobs/create-filelists
+++ b/cron-jobs/create-filelists
@@ -5,7 +5,6 @@
 
 reposdir=${FTP_BASE}
 targetdir=${FTP_BASE}
-repos=(core extra testing community community-testing staging multilib)
 
 script_lock
 
@@ -28,7 +27,7 @@ esac
 
 FILESEXT="${DBEXT//db/files}"
 
-for repo in ${repos[@]}; do
+for repo in ${PKGREPO[@]}; do
     REPO_DB_FILE="${repo}$DBEXT"
     FILES_DB_FILE="${repo}$FILESEXT"
     for arch in ${ARCHES[@]}; do
diff --git a/cron-jobs/integrity-check b/cron-jobs/integrity-check
index 0b2b9c7..c120cfd 100755
--- a/cron-jobs/integrity-check
+++ b/cron-jobs/integrity-check
@@ -7,7 +7,7 @@ if [ $# -ne 2 ]; then
     exit 1
 fi
 
-for arch in i686 x86_64; do
+for arch in ${ARCHES[@]}; do
     $basedir/check_archlinux/check_packages.py \
         --repos="$1" \
         --abs-tree="/srv/abs/rsync/$arch,/srv/abs/rsync/any" --arch="$arch" |\
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs
index a482eb7..0cf062f 100755
--- a/cron-jobs/sourceballs
+++ b/cron-jobs/sourceballs
@@ -5,7 +5,6 @@
 
 ftpbase="${FTP_BASE}"
 srcbase="${FTP_BASE}/sources"
-repos=(core extra testing community community-testing staging multilib)
 
 script_lock
 
@@ -18,7 +17,7 @@ FAILED_PKGS=""
 [ -e "$srcbase/errors.txt" ] && /bin/mv "$srcbase/errors.txt" "$srcbase/errors.txt.old"
 echo "Errors occured during run:" > "$srcbase/errors.txt"
 
-for repo in ${repos[@]}; do
+for repo in ${PKGREPO[@]}; do
     for arch in ${ARCHES[@]} any; do
         ftppath="$ftpbase/$repo/os/$arch"
         if [ ! -d "$ftppath" ]; then