fix #423. rename config sample config.{toml.sample => sample.toml}

Makefile.in

@@ -253,7 +253,7 @@ $(binary_package): $(admin_dir)/build build packages
 	mkdir build/admin
 	cp -R $(admin_dir)/build/* build/admin/
 	cp -R scripts/ build/
-	cp config.toml.sample build/config.toml
+	cp config.sample.toml build/config.toml
 	sed -i 's/.\/admin/\/opt\/influxdb\/current\/admin/g' build/config.toml
 	sed -i 's/influxdb.log/\/opt\/influxdb\/shared\/log.txt/g' build/config.toml
 	sed -i 's/\/tmp\/influxdb\/development\/db/\/opt\/influxdb\/shared\/data\/db/g' build/config.toml

src/daemon/influxd.go

@@ -56,7 +56,7 @@ func setupLogging(loggingLevel, logFile string) {
 }
 
 func main() {
-	fileName := flag.String("config", "config.toml.sample", "Config file")
+	fileName := flag.String("config", "config.sample.toml", "Config file")
 	wantsVersion := flag.Bool("v", false, "Get version number")
 	resetRootPassword := flag.Bool("reset-root", false, "Reset root password")
 	pidFile := flag.String("pidfile", "", "the pid file")

src/integration/benchmark_test.go

@@ -108,7 +108,7 @@ func (self *Server) start() error {
 	root := filepath.Join(dir, "..", "..")
 	filename := filepath.Join(root, "daemon")
 	if self.configFile == "" {
-		self.configFile = "config.toml.sample"
+		self.configFile = "config.sample.toml"
 	}
 	p, err := os.StartProcess(filename, []string{filename, "-config", self.configFile}, &os.ProcAttr{
 		Dir:   root,