Merge pull request #87 from voxpupuli/set-e

add set -e to all scripts.

puppetserver/docker-entrypoint.d/20-use-templates-initially.sh

@@ -1,4 +1,6 @@
-#! /bin/bash
+#!/bin/bash
+
+set -e
 
 # During build, pristine config files get copied to this directory. If
 # they are not in the current container, use these templates as the

puppetserver/docker-entrypoint.d/30-set-permissions.sh

@@ -1,4 +1,6 @@
-#! /bin/bash
+#!/bin/bash
+
+set -e
 
 chown -R puppet:puppet /etc/puppetlabs/puppet/
 chown -R puppet:puppet /opt/puppetlabs/server/data/puppetserver/

puppetserver/docker-entrypoint.d/40-update-puppetdb-conf.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if test -n "${PUPPETDB_SERVER_URLS}" ; then
   sed -i "s@^server_urls.*@server_urls = ${PUPPETDB_SERVER_URLS}@" /etc/puppetlabs/puppet/puppetdb.conf
 fi

puppetserver/docker-entrypoint.d/50-set-certname.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if [ -n "${PUPPETSERVER_HOSTNAME}" ]; then
   /opt/puppetlabs/bin/puppet config set server "$PUPPETSERVER_HOSTNAME"
 fi

puppetserver/docker-entrypoint.d/55-set-masterport.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 hocon() {
   /opt/puppetlabs/puppet/lib/ruby/vendor_gems/bin/hocon "$@"
 }

puppetserver/docker-entrypoint.d/56-set-environmentpath.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
-#
-puppet config set --section server environmentpath $ENVIRONMENTPATH
 
+set -e
+
+puppet config set --section server environmentpath $ENVIRONMENTPATH

puppetserver/docker-entrypoint.d/57-set-hiera_config.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
-#
-puppet config set --section server hiera_config $HIERACONFIG
 
+set -e
+
+puppet config set --section server hiera_config $HIERACONFIG

puppetserver/docker-entrypoint.d/60-setup-autosign.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # Configure puppet to use a certificate autosign script (if it exists)
 # AUTOSIGN=true|false|path_to_autosign.conf
 if test -n "${AUTOSIGN}" ; then

puppetserver/docker-entrypoint.d/70-set-dns-alt-names.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # Allow setting dns_alt_names for the compilers certificate. This
 # setting will only have an effect when the container is started without
 # an existing certificate on the /etc/puppetlabs/puppet volume

puppetserver/docker-entrypoint.d/83-environment-cache.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
-#
+
+set -e
+
 if [ -n "$PUPPETSERVER_ENVIRONMENT_TIMEOUT" ]; then
   echo "Settings environment_timeout to ${PUPPETSERVER_ENVIRONMENT_TIMEOUT}"
   puppet config set --section server environment_timeout $PUPPETSERVER_ENVIRONMENT_TIMEOUT

puppetserver/docker-entrypoint.d/84-enable_graphite.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if [[ "$PUPPETSERVER_GRAPHITE_EXPORTER_ENABLED" == "true" ]]; then
   if [[ -n "$PUPPETSERVER_GRAPHITE_HOST" && -n "$PUPPETSERVER_GRAPHITE_PORT" ]]; then
     echo "Enabling graphite exporter"
@@ -9,4 +11,3 @@ if [[ "$PUPPETSERVER_GRAPHITE_EXPORTER_ENABLED" == "true" ]]; then
     exit 99
   fi
 fi
-

puppetserver/docker-entrypoint.d/85-setup-storeconfigs.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 if [ -n "$PUPPET_STORECONFIGS_BACKEND" ]; then
   puppet config set storeconfigs_backend $PUPPET_STORECONFIGS_BACKEND --section master
 fi

puppetserver/docker-entrypoint.d/88-enable-cache-delete-api.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
-#
+
+set -e
+
 if [[ "$PUPPETSERVER_ENABLE_ENV_CACHE_DEL_API" == true ]]; then
   if [[ $(grep 'puppet-admin-api' /etc/puppetlabs/puppetserver/conf.d/auth.conf) ]]; then
     echo "Admin API already set"

puppetserver/docker-entrypoint.d/89-csr_attributes.rb

@@ -5,11 +5,10 @@
 
 begin
   csr_yaml = YAML.dump(JSON.load(ENV['CSR_ATTRIBUTES']))
-  File.open('/etc/puppetlabs/puppet/csr_attributes.yaml', 'w') do |file|
-    file.write(csr_yaml)
-  end
+  File.write('/etc/puppetlabs/puppet/csr_attributes.yaml', csr_yaml)
 rescue => error
   puts "Error on reading JSON env. Terminating"
+  puts "Malformed JSON: #{ENV['CSR_ATTRIBUTES']}"
   p error.message
   exit 99
 end

puppetserver/docker-entrypoint.d/89-csr_attributes.sh

@@ -1,3 +1,6 @@
 #!/bin/bash
-echo $CSR_ATTRIBUTES
+
+set -e
+
+echo "CSR Attributes: ${CSR_ATTRIBUTES}"
 /opt/puppetlabs/puppet/bin/ruby /docker-entrypoint.d/89-csr_attributes.rb

puppetserver/docker-entrypoint.d/90-ca.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 ca_running() {
   status=$(curl --silent --fail --insecure "https://${CA_HOSTNAME}:${CA_PORT:-8140}/status/v1/simple")
   test "$status" = "running"

puppetserver/docker-entrypoint.d/99-log-config.sh

@@ -1,5 +1,7 @@
 #! /bin/sh
 
+set -e
+
 ### Print configuration for troubleshooting
 echo "System configuration values:"
 # shellcheck disable=SC2039 # Docker injects $HOSTNAME