Merge pull request #1112 from deis/check-configs

fix(confd): services check for valid config before reloading

Author: mboersma

controller/bin/check

@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+# Check that the configuration for deis-controller is valid.
+#
+
+if [[ -f /templates/confd_settings.py ]] ; then
+    set -e
+
+    # check that "<no value>" isn't in the templated file
+    grep -q -v "<no value>" /templates/confd_settings.py
+
+    THIS_DIR=$(cd $(dirname $0); pwd) # absolute path
+    PARENT_DIR=$(dirname $THIS_DIR)
+
+    # check the Django configuration file compatibility
+    $PARENT_DIR/manage.py check > /dev/null
+
+    # validate the Django models
+    $PARENT_DIR/manage.py validate > /dev/null
+fi

controller/conf.d/confd_settings.toml

@@ -11,5 +11,5 @@ keys = [
   "/deis/registry",
   "/deis/domains",
 ]
-check_cmd = "test -e {{ .src }}"
+check_cmd = "/app/bin/check"
 reload_cmd = "/app/bin/reload"

database/bin/check

@@ -0,0 +1,17 @@
+#!/bin/bash
+#
+# Check that the configuration for deis-database is valid.
+#
+
+set -e
+
+# check that "<no value>" isn't in the templated files
+if [[ -f /etc/postgresql/9.3/main/postgresql.conf ]] ; then
+    grep -q -v "<no value>" /etc/postgresql/9.3/main/postgresql.conf
+fi
+if [[ -f /etc/postgresql/9.3/main/pg_hba.conf ]] ; then
+    grep -q -v "<no value>" /etc/postgresql/9.3/main/pg_hba.conf
+fi
+if [[ -f /usr/local/bin/reload ]] ; then
+    grep -q -v "<no value>" /usr/local/bin/reload
+fi

database/conf.d/pg_hba.conf.toml

@@ -6,4 +6,6 @@ gid = 104
 mode  = "0640"
 keys = [
   "/deis/database",
-]
+]
+check_cmd = "/app/bin/check"
+reload_cmd = "/usr/local/bin/reload"

database/conf.d/postgresql.conf.toml

@@ -6,4 +6,6 @@ gid = 104
 mode  = "0644"
 keys = [
   "/deis/database",
-]
+]
+check_cmd = "/app/bin/check"
+reload_cmd = "/usr/local/bin/reload"

database/conf.d/reload.toml

@@ -7,5 +7,5 @@ mode  = "0755"
 keys = [
   "/deis/database",
 ]
-check_cmd = "netstat -lnt | awk '$6 == \"LISTEN\" && $4 ~ \".5432\"' "
-reload_cmd = "/usr/local/bin/reload"
+check_cmd = "/app/bin/check"
+reload_cmd = "/usr/local/bin/reload"

registry/bin/check

@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Check that the configuration for deis-registry is valid.
+#
+
+if [[ -f /docker-registry/config/config.yml ]] ; then
+    set -e
+
+    # check that "<no value>" isn't in the templated file
+    grep -q -v "<no value>" /docker-registry/config/config.yml
+fi

registry/bin/reload

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+# Send SIGHUP to gunicorn in general, since we didn't launch it with `--pid`
+pkill -HUP -u registry gunicorn

registry/conf.d/config.toml

@@ -7,3 +7,5 @@ mode  = "0644"
 keys = [
   "/deis/registry",
 ]
+check_cmd = "/app/bin/check"
+reload_cmd = "/app/bin/reload"