Only move storage if actually starting a server (closes #1067)

caddy/caddymain/run.go

@@ -48,7 +48,6 @@ func init() {
 // Run is Caddy's main() function.
 func Run() {
 	flag.Parse()
-	moveStorage() // TODO: This is temporary for the 0.9 release, or until most users upgrade to 0.9+
 
 	caddy.AppName = appName
 	caddy.AppVersion = appVersion
@@ -92,6 +91,8 @@ func Run() {
 		os.Exit(0)
 	}
 
+	moveStorage() // TODO: This is temporary for the 0.9 release, or until most users upgrade to 0.9+
+
 	// Set CPU cap
 	err := setCPU(cpu)
 	if err != nil {