Merge branch 'master' of ssh://camlistore.org:29418/runsit
diff --git a/run.sh b/run.sh
index ebb860c..97d805c 100755
--- a/run.sh
+++ b/run.sh
@@ -3,4 +3,4 @@
 set -e
 go build -x -o ./test/daemon/testdaemon ./test/daemon
 go build -x -o runsit
-./runsit $@
+./runsit --config_dir=config $@
diff --git a/runsit.go b/runsit.go
index e474867..8c0f66f 100644
--- a/runsit.go
+++ b/runsit.go
@@ -44,7 +44,7 @@
 // Flags.
 var (
 	httpPort  = flag.Int("http_port", 4762, "HTTP localhost admin port.")
-	configDir = flag.String("config_dir", "config", "Directory containing per-task *.json config files.")
+	configDir = flag.String("config_dir", "/etc/runsit", "Directory containing per-task *.json config files.")
 )
 
 var (