X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/cec9366aea873ebe2dca710d42f78d080c7d1ff0..cab31c75dc608d3567c07c616c2cd84f7be2ce3e:/mrconfig?ds=inline

diff --git a/mrconfig b/mrconfig
index 5b51857..38ccfbb 100644
--- a/mrconfig
+++ b/mrconfig
@@ -1,23 +1,38 @@
 # An example config file for the mr(1) command.
 
-[default]
+[DEFAULT]
 # Teach mr how to run svn cleanup.
 cleanup = if [ -d "$MR_REPO"/.svn ]; then svn cleanup ; fi
 # Tests used in the skips below.
 # - wantsrc checks whether I probably want a full source checkout (quite
 #   large)
+# - private are hosts I trust private data to
 # - mylaptop only succeeds if it's on my main development laptop, which 
 #   gets lots of extra cruft
-lib = \
-	wantsrc() { \
-		test "$(whoami)" = joey; \
-	}; \
-	mylaptop() { \
-		test "$(hostname)" = kodama; \
+# - kite only succeeds on kite
+lib = 								\
+	wantsrc() {						\
+		test "$(whoami)" = joey				\
+	}							\
+	private() {						\
+		if [ "$(whoami)" = joey ]; then			\
+			case "$(hostname)" in			\
+			wren|kodama|dragon|dodo|bluebird)	\
+				return 0			\
+			;;					\
+			esac					\
+		fi						\
+		return 1					\
+	}							\
+	mylaptop() {						\
+		test "$(hostname)" = kodama			\
+	}							\
+	kite() {						\
+		test "$(hostname)" = wren			\
 	}
 
 [src/mr]
-checkout = git clone ssh://kitenet.net/srv/git/kitenet.net/mr
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/mr
 skip = ! wantsrc
 
 [src/linux-2.6]
@@ -29,7 +44,7 @@ skip = ! mylaptop || ! wantsrc
 checkout = \
 	git clone git://git.debian.org/git/dpkg/dpkg.git && \
 	cd dpkg && \
-	git remote add kite ssh://kitenet.net/srv/git/kitenet.net/dpkg && \
+	git remote add kite ssh://git.kitenet.net/srv/git/kitenet.net/dpkg && \
 	git fetch kite && \
 	git checkout -b sourcev3 kite/sourcev3
 update = git pull origin master && git pull kite sourcev3
@@ -45,6 +60,22 @@ checkout = \
 # and only rarely
 update = echo "skipping cvs update (too slow)"
 status = echo "skipping cvs status (too ugly)"
+skip = ! mylaptop || ! wantsrc
+
+[src/packages/uqm]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm
+skip = ! wantsrc
+
+[src/packages/uqm-content]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm-content
+skip = ! wantsrc
+
+[src/packages/uqm-voice]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm-voice
+skip = ! wantsrc
+
+[src/packages/uqm-music]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/uqm-music
 skip = ! wantsrc
 
 # My home directory, which I keep in svn.
@@ -52,3 +83,11 @@ skip = ! wantsrc
 checkout = svn co svn+ssh://svn.kitenet.net/srv/svn/joey/trunk/home-$(hostname) joey
 # run svnfix after each update
 update = svn update && svnfix
+
+[mail]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/mail
+skip = ! private
+
+[doc]
+checkout = git clone ssh://git.kitenet.net/srv/git/kitenet.net/joey/private/doc
+skip = ! private