From 370df28d356eeda23711e6a169854af2b100b5e5 Mon Sep 17 00:00:00 2001
From: Petr Baudis <petr.baudis@novartis.com>
Date: Thu, 24 Jul 2008 17:10:55 +0200
Subject: [PATCH] jobs/: Use Girocco::Config for all configurable values

---
 jobs/Girocco        |  1 +
 jobs/clone.sh       | 22 +++++++++++-----------
 jobs/clonecheck.sh  |  9 +++++----
 jobs/shlib.sh       |  9 +++++++--
 jobs/update.sh      |  2 +-
 jobs/updatecheck.sh |  4 ++--
 6 files changed, 27 insertions(+), 20 deletions(-)
 create mode 120000 jobs/Girocco

diff --git a/jobs/Girocco b/jobs/Girocco
new file mode 120000
index 0000000..c73296d
--- /dev/null
+++ b/jobs/Girocco
@@ -0,0 +1 @@
+../Girocco/
\ No newline at end of file
diff --git a/jobs/clone.sh b/jobs/clone.sh
index 199ed1c..38975d5 100755
--- a/jobs/clone.sh
+++ b/jobs/clone.sh
@@ -9,9 +9,9 @@ queuedir="$(pwd)"
 
 bang_action="clone"
 bang_trap() {
-	# This removes any remnants from /srv/git/$proj.git _and_ gets rid
+	# This removes any remnants from "$cfg_reporoot"/$proj.git _and_ gets rid
 	# of the group record.
-	perl -I/home/repo/repomgr/cgi -MGirocco::Project -e 'Girocco::Project->ghost('"'$proj'"')->delete;'
+	perl -I. -MGirocco::Project -e 'Girocco::Project->ghost('"'$proj'"')->delete;'
 	cd "$queuedir" && rm -rf "$proj"/* && rmdir -p "$proj"
 }
 
@@ -27,32 +27,32 @@ fi
 bang git clone "${ref[@]}" --bare "$url" repodir
 
 # Double-check that we aren't going to overwrite anything existing
-! [ -d /srv/git/"$proj".git ]
+! [ -d "$cfg_reporoot/$proj.git" ]
 
 # Set up fork container if necessary
 lproj="$(echo "$proj" | sed 's/^\(.*\/\)\(.*\)/\1/')"
 if [ z"$lproj" != z"$proj" ]; then
-	bang mkdir -m 0775 -p /srv/git/"$lproj"
+	bang mkdir -m 0775 -p "$cfg_reporoot/$lproj"
 fi
 
 # Move us into our new home
-bang mv repodir /srv/git/"$proj".git
+bang mv repodir "$cfg_reporoot/$proj.git"
 bang chmod g+w base_url owner description homepage README.html
-bang mv base_url owner description homepage README.html /srv/git/"$proj".git/
+bang mv base_url owner description homepage README.html "$cfg_reporoot/$proj.git/"
 
 # Reconfigure
-bang git --git-dir=/srv/git/"$proj".git config --bool --add mirror.allowed true
-bang git --git-dir=/srv/git/"$proj".git update-server-info
+bang git --git-dir="$cfg_reporoot/$proj.git" config --bool --add mirror.allowed true
+bang git --git-dir="$cfg_reporoot/$proj.git" update-server-info
 
 # Clean up the queue
 cd "$queuedir" && rm -rf "$proj"/* && rmdir -p "$proj"
 # NO bang BELOW THIS POINT! rm -r depends on cwd.
 
-mail -s "[repo.or.cz] $proj clone completed" "$mail",pasky@ucw.cz <<EOT
+mail -s "[$cfg_name] $proj clone completed" "$mail,$cfg_admin" <<EOT
 Congratulations! The clone of project $proj just completed. You can now adjust
 the project settings at
 
-	http://repo.or.cz/m/editproj.cgi?name=$proj
+	$cfg_webadmurl/editproj.cgi?name=$proj
 
-Then check out the cool stuff at http://repo.or.cz/w/$proj.git !
+Then check out the cool stuff at $cfg_gitweburl/$proj.git !
 EOT
diff --git a/jobs/clonecheck.sh b/jobs/clonecheck.sh
index 5290a49..0541e11 100755
--- a/jobs/clonecheck.sh
+++ b/jobs/clonecheck.sh
@@ -1,14 +1,15 @@
 #!/bin/sh
 
 . shlib.sh
+config_to_env
 
 shopt -s nullglob
 
-cd /home/repo/repodata/to-clone
+cd "$cfg_mqueuedir"/to-clone
 get_repo_list_here |
 	while read dir; do
-		mv "$dir" /home/repo/repodata/cloning
-		cd /home/repo/repodata/cloning
-		/home/repo/repomgr/clone.sh "$dir"
+		mv "$dir" "$cfg_mqueuedir"/cloning
+		cd "$cfg_mqueuedir"/cloning
+		"$cfg_basedir"/clone.sh "$dir"
 		exit # next dir at next cron invocation, to be safe
 	done
diff --git a/jobs/shlib.sh b/jobs/shlib.sh
index ec3351a..362ed04 100644
--- a/jobs/shlib.sh
+++ b/jobs/shlib.sh
@@ -1,7 +1,12 @@
 #!/bin/bash
 
 
-alias git=/home/pasky/bin/git
+# Import all the variables from Girocco::Config to the local environment,
+# prefixing them with 'cfg_'. E.g. $cfg_admin is admin's mail address now.
+eval $(perl -I. -MGirocco::Config -le 'foreach (keys %Girocco::Config::) { print "cfg_$_=\"".quotemeta(${$Girocco::Config::{$_}})."\""; }')
+
+
+alias git="$git_bin"
 
 
 # bang CMD... will execute the command with well-defined failure mode;
@@ -20,7 +25,7 @@ bang() {
 			[ "$bang_once" ] && echo "you will not receive any more notifications until recovery"
 			echo "Log follows:"
 			cat "$bang_log"
-		} | mail -s "[repo.or.cz] $proj $bang_action failed" "$mail",pasky@ucw.cz
+		} | mail -s "[$cfg_name] $proj $bang_action failed" "$mail,$cfg_admin"
 	fi
 	touch .banged
 	bang_trap
diff --git a/jobs/update.sh b/jobs/update.sh
index 68494cd..59069f9 100755
--- a/jobs/update.sh
+++ b/jobs/update.sh
@@ -18,6 +18,6 @@ bang git --git-dir=. update-server-info
 date -R >.last_refresh
 
 if [ -e .banged ]; then
-	echo "$proj update succeeded - failure recovery" | mail -s "[repo.or.cz] $proj update succeeded" "$mail",pasky@ucw.cz
+	echo "$proj update succeeded - failure recovery" | mail -s "[$cfg_name] $proj update succeeded" "$mail,$cfg_admin"
 	rm .banged
 fi
diff --git a/jobs/updatecheck.sh b/jobs/updatecheck.sh
index d27f850..a8dcb31 100755
--- a/jobs/updatecheck.sh
+++ b/jobs/updatecheck.sh
@@ -12,7 +12,7 @@ touch /tmp/gitupdatelock
 # That prevents objects from missing, since repack -l will automagically
 # put the now-going-away objects into the forked repository's object store.
 
-cd /srv/git
+cd "$cfg_reporoot"
 get_repo_list_here | tac |
 	while read dir; do
 		# echo "+ `date` $dir"
@@ -20,7 +20,7 @@ get_repo_list_here | tac |
 			(cd "$dir/objects" && [ "$(ls ?? 2>/dev/null)" ] && git --git-dir=.. repack -a -l -d -q)
 			git --git-dir="$dir" update-server-info
 		else
-			/home/repo/repomgr/update.sh "${dir%.git}"
+			"$cfg_basedir"/update.sh "${dir%.git}"
 		fi
 		# echo "- `date` $dir"
 	done 2>&1 | grep -v '^Pack.*created\.$'
-- 
2.11.4.GIT