Add new get_repos_for_host() function

And use it. This allows us to have server-specific behavior in our scripts
without further patching, and it also allows us to simplify some of our
scripts a fair amount.

Signed-off-by: Dan McGee <dan@archlinux.org>

2 files changed, 31 insertions, 27 deletions

diff --git a/cron-jobs/adjust-permissions b/cron-jobs/adjust-permissions
index 6670a6f..91f2de7 100755
--- a/cron-jobs/adjust-permissions
+++ b/cron-jobs/adjust-permissions
@@ -1,36 +1,40 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ -f /tmp/.ftpmaint.lck ]; then
-	exit 0
+    exit 0
 fi
 
 /bin/touch /tmp/.ftpmaint.lck
 
+. "$(dirname $0)/../db-functions"
+. "$(dirname $0)/../config"
+
+get_dir_owner() {
+    case $1 in
+        core)
+            echo "ftp:ftp-arch" ;;
+        extra)
+            echo "ftp:ftp-extra" ;;
+        testing)
+            echo "ftp:ftp-extra" ;;
+        community)
+            echo "root:tusers" ;;
+        community-testing)
+            echo "root:tusers" ;;
+    esac
+}
+
 #adjust the nice level to run at a lower priority
 /usr/bin/renice +10 -p $$ > /dev/null
 
 cd /srv/ftp
-if [ -d "core" ]; then
-    #This is unique to gerolde (main arch server)
-    /bin/chown -R ftp:ftp-arch core/os/any
-    /bin/chown -R ftp:ftp-arch core/os/i686
-    /bin/chown -R ftp:ftp-arch core/os/x86_64
-    /bin/chown -R ftp:ftp-extra {extra,testing}/os/any
-    /bin/chown -R ftp:ftp-extra {extra,testing}/os/i686
-    /bin/chown -R ftp:ftp-extra {extra,testing}/os/x86_64
-    for d in core extra testing; do
-        /bin/chmod -R g+w $d/os/any
-        /bin/chmod -R g+w $d/os/i686
-        /bin/chmod -R g+w $d/os/x86_64
-    done
-else
-    /bin/chown -R root:tusers {community,community-testing}/os/any
-    /bin/chown -R root:tusers {community,community-testing}/os/i686
-    /bin/chown -R root:tusers {community,community-testing}/os/x86_64
-    /bin/chmod -R g+w {community,community-testing}/os/any
-    /bin/chmod -R g+w {community,community-testing}/os/i686
-    /bin/chmod -R g+w {community,community-testing}/os/x86_64
-fi
+for d in $(get_repos_for_host); do
+    owner="$(get_dir_owner $d)"
+    echo /bin/chown -R $owner $d/os/{any,i686,x86_64}
+    #/bin/chown -R $owner $d/os/{any,i686,x86_64}
+    echo /bin/chmod -R g+w $d/os/{any,i686,x86_64}
+    #/bin/chmod -R g+w $d/os/{any,i686,x86_64}
+done
 
 /bin/chmod 555 /srv/ftp
 
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 04caf93..d66138c 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-repos="core extra testing"
+. "$(dirname $0)/../db-functions"
+. "$(dirname $0)/../config"
+
+repos="$(get_repos_for_host)"
 
 LOCKFILE="/tmp/.ftpdircleanup.lock"
 
@@ -27,9 +30,6 @@ trap ctrl_c 2
 #adjust the nice level to run at a lower priority
 /usr/bin/renice +10 -p $$ > /dev/null
 
-#Get our destination dir
-. "$(dirname $0)/../db-functions"
-
 for repo in $repos; do
     $(dirname $0)/../misc-scripts/ftpdir-cleanup $repo $CLEANUP_DESTDIR
 done