git.lirion.de

Of git, get, and gud

summaryrefslogtreecommitdiffstats
path: root/scripts/config_version.sh
diff options
context:
space:
mode:
authormail_redacted_for_web 2017-07-05 16:55:39 -0700
committermail_redacted_for_web 2017-07-05 17:09:51 -0700
commit124b1a2727466e63cf82858bb09749454dae40d3 (patch)
tree6ce7bd7707c0abc0bbab731b4b1b908975cd4e3b /scripts/config_version.sh
parentac9785273a1060a5b6c18129985f8cdb01c77d54 (diff)
downloadcontrol-repo-template-124b1a2727466e63cf82858bb09749454dae40d3.tar.bz2
config_version: Show the compiling master's name
Prior to this, the config_version script just showed the commit ID of the version of code being compiled. This commit includes the compiling Puppet master's hostname and environment name in the config_version. This is very useful for debugging when a Puppet master is failing and you have multiple masters behind a load balancer. The output of config_version now looks like this: pupmaster01-production-ac9785273a10
Diffstat (limited to 'scripts/config_version.sh')
-rwxr-xr-xscripts/config_version.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/config_version.sh b/scripts/config_version.sh
index bc77213..8dd8086 100755
--- a/scripts/config_version.sh
+++ b/scripts/config_version.sh
@@ -3,10 +3,10 @@ if [ -e $1/$2/.r10k-deploy.json ]
then
/opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/code_manager_config_version.rb $1 $2
elif [ -e /opt/puppetlabs/server/pe_version ]
-then
- /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2
+then
+ /opt/puppetlabs/puppet/bin/ruby $1/$2/scripts/config_version.rb $1 $2
else
/usr/bin/git --version > /dev/null 2>&1 &&
/usr/bin/git --git-dir $1/$2/.git rev-parse HEAD ||
date +%s
-fi
+fi