X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=examples%2Fgrok-pull.post_update_hook.sh;h=092ca283b30e289165cf86d279d22fb8a0ac1dbe;hb=8096f9504d06f9a08726ff24df685cce7fcdcb09;hp=ab4e54e7bf0630c95728cfbe769e6fd08ad4f8c0;hpb=28264f7af4d9f4fab951f0613a0b08b6e98af7d3;p=public-inbox.git

diff --git a/examples/grok-pull.post_update_hook.sh b/examples/grok-pull.post_update_hook.sh
index ab4e54e7..092ca283 100755
--- a/examples/grok-pull.post_update_hook.sh
+++ b/examples/grok-pull.post_update_hook.sh
@@ -1,8 +1,15 @@
 #!/bin/sh
+
+# use flock(1) from util-linux to avoid seek contention on slow HDDs
+# when using multiple `pull_threads' with grok-pull:
+# [ "${FLOCKER}" != "$0" ] && exec env FLOCKER="$0" flock "$0" "$0" "$@" || :
+
 # post_update_hook for repos.conf as used by grok-pull, takes a full
 # git repo path as it's first and only arg.
 full_git_dir="$1"
 
+url_base=http://127.0.0.1:8080/
+
 # same default as other public-inbox-* tools
 PI_CONFIG=${PI_CONFIG-~/.public-inbox/config}
 
@@ -26,7 +33,13 @@ else
 fi
 
 # run public-inbox-init iff unconfigured
-cfg_dir=$(git config -f "$PI_CONFIG" publicinbox."$inbox_name".dir)
+cfg_dir=$(git config -f "$PI_CONFIG" publicinbox."$inbox_name".inboxdir)
+
+# check legacy name for "inboxdir"
+case $cfg_dir in
+'') cfg_dir=$(git config -f "$PI_CONFIG" publicinbox."$inbox_name".mainrepo) ;;
+esac
+
 case $cfg_dir in
 '')
 	remote_git_url=$(git --git-dir="$full_git_dir" config remote.origin.url)
@@ -48,6 +61,7 @@ case $cfg_dir in
 
 	config_url="$remote_inbox_url"/_/text/config/raw
 	remote_config="$inbox_dir"/remote.config.$$
+	infourls=
 	trap 'rm -f "$remote_config"' EXIT
 	if curl --compressed -sSf -v "$config_url" >"$remote_config"
 	then
@@ -64,13 +78,15 @@ case $cfg_dir in
 		esac
 		newsgroups=$(git config -f "$remote_config" -l | \
 			sed -ne 's/^publicinbox\..\+\.newsgroup=//p')
+		infourls=$(git config -f "$remote_config" -l | \
+			sed -ne 's/^publicinbox\..\+.infourl=//p')
 	else
 		newsgroups=
 		addresses="$inbox_name@$$.$(hostname).example.com"
 		echo >&2 "E: curl $config_url failed"
 		echo >&2 "E: using bogus <$addresses> for $inbox_dir"
 	fi
-	local_url="http://127.0.0.1:8080/$inbox_name"
+	local_url="$url_base$inbox_name"
 	public-inbox-init -V$inbox_fmt "$inbox_name" \
 		"$inbox_dir" "$local_url" $addresses
 
@@ -87,6 +103,12 @@ case $cfg_dir in
 		# only one newsgroup per inbox
 		break
 	done
+	for url in $infourls
+	do
+		git config -f "$PI_CONFIG" \
+			"publicinbox.$inbox_name.infourl" "$url"
+	done
+	curl -sSfv "$remote_inbox_url"/description >"$inbox_dir"/description
 	echo "I: $inbox_name at $inbox_dir ($addresses) $local_url"
 	;;
 esac
@@ -102,6 +124,7 @@ then
 		: v2 inboxes may be init-ed with an empty msgmap
 		;;
 	*)
+		# if on HDD and limited RAM, add `-j0' w/ public-inbox 1.6.0+
 		$EATMYDATA public-inbox-index -v "$inbox_dir"
 		;;
 	esac