Merge pull request #1629 from deis/fix/check-config

fix(*): all services ensure valid config file on reload

Author: Gabriel Monroy

builder/bin/check

@@ -0,0 +1,8 @@
+#!/bin/bash
+#
+# Check that the configuration for deis-builder is valid.
+#
+
+if grep -q "<no value>" $1 ; then
+	exit 1
+fi

builder/conf.d/authorized_keys.toml

@@ -7,3 +7,4 @@ mode  = "0600"
 keys = [
   "/deis/builder/users",
 ]
+check_cmd = "/app/bin/check {{ .src }}"

builder/conf.d/builder.toml

@@ -9,3 +9,4 @@ keys = [
   "/deis/builder",
   "/deis/registry",
 ]
+check_cmd = "/app/bin/check {{ .src }}"

builder/conf.d/check-repos.toml

@@ -8,3 +8,4 @@ keys = [
   "/deis/services",
 ]
 reload_cmd = "/home/git/check-repos"
+check_cmd = "/app/bin/check {{ .src }}"

builder/conf.d/gitreceive.toml

@@ -3,4 +3,5 @@ src   = "gitreceive"
 dest  = "/usr/local/bin/gitreceive"
 uid = 0
 gid = 0
-mode  = "0755"
+mode  = "0755"
+check_cmd = "/app/bin/check {{ .src }}"

builder/conf.d/receiver.toml

@@ -7,3 +7,4 @@ mode  = "0755"
 keys = [
   "/deis/controller",
 ]
+check_cmd = "/app/bin/check {{ .src }}"

builder/tests/builder_test.go

@@ -38,10 +38,14 @@ func runDeisBuilderTest(
 func TestBuilder(t *testing.T) {
 	setkeys := []string{
 		"/deis/registry/protocol",
-		"deis/registry/host",
+		"/deis/registry/host",
 		"/deis/registry/port",
 		"/deis/cache/host",
 		"/deis/cache/port",
+		"/deis/controller/protocol",
+		"/deis/controller/host",
+		"/deis/controller/port",
+		"/deis/controller/builderKey",
 	}
 	setdir := []string{
 		"/deis/controller",

router/bin/check

@@ -0,0 +1,12 @@
+#!/bin/bash
+#
+# Check that the configuration for deis-router is valid.
+#
+
+if grep -q "<no value>" $1 ; then
+	exit 1
+fi
+
+if ! /usr/sbin/nginx -t -c $1 ; then
+	exit 1
+fi

router/conf.d/nginx.conf.toml

@@ -11,5 +11,5 @@ keys = [
   "/deis/controller",
   "/deis/builder",
 ]
-check_cmd  = "/usr/sbin/nginx -t -c {{ .src }}"
+check_cmd  = "/app/bin/check {{ .src }}"
 reload_cmd = "/usr/sbin/nginx -s reload"