diff --git a/rpms/puppet-initial/1.0.1/release b/rpms/puppet-initial/1.0.2/release similarity index 100% rename from rpms/puppet-initial/1.0.1/release rename to rpms/puppet-initial/1.0.2/release diff --git a/rpms/puppet-initial/resources/puppet-initial b/rpms/puppet-initial/resources/puppet-initial index f8d0eb5..fb958fa 100644 --- a/rpms/puppet-initial/resources/puppet-initial +++ b/rpms/puppet-initial/resources/puppet-initial @@ -1,5 +1,9 @@ #!/bin/bash +# Ensure the hostname is set +hostnamectl set-hostname $(hostname -s).main.unkin.net +grep '^HOSTNAME=' /etc/sysconfig/network | cut -d= -f2 | grep -q '\.' || sed -i 's/^\(HOSTNAME=[^\.]*\)$/\1.main.unkin.net/' /etc/sysconfig/network + # Install CA for Puppet test -f /etc/puppetlabs/puppet/ssl/certs/ca.pem || mkdir -p /etc/puppetlabs/puppet/ssl/certs && wget --no-check-certificate https://puppetca.query.consul:8140/puppet-ca/v1/certificate/ca -O /etc/puppetlabs/puppet/ssl/certs/ca.pem