Merge branch 'release/v0.5.3'

coi-gov-pl · Aug 10, 2017 · d16a061 · d16a061
2 parents 6ba864e + 385dfbc
commit d16a061
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/puppeter/__init__.py b/puppeter/__init__.py
@@ -4,7 +4,7 @@
 from typing import Type
 
 # The version of the app
-__version__ = '0.5.2'
+__version__ = '0.5.3'
 __program__ = 'puppeter'
 
 

diff --git a/puppeter/persistence/gateway/bash-libraries.sh b/puppeter/persistence/gateway/bash-libraries.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set +x
 function reload_shell {
-    set +e
+    set +ex
     local files='~/.bash_profile ~/.bash_login ~/.profile'
     if [ -f /etc/profile ]; then
         . /etc/profile
@@ -12,6 +12,6 @@ function reload_shell {
             break
         fi
     done
-    set -e
+    set -ex
 }
 set -x
diff --git a/puppeter/persistence/gateway/csr.pp b/puppeter/persistence/gateway/csr.pp
@@ -1,7 +1,5 @@
 file { "${settings::confdir}/csr_attributes.yaml":
   ensure  => 'file',
-  owner   => 'puppet',
-  group   => 'puppet',
   mode    => '0640',
   content => '@{content}'
 }
diff --git a/puppeter/persistence/gateway/installer/redhat/puppetagent.sh b/puppeter/persistence/gateway/installer/redhat/puppetagent.sh
@@ -3,4 +3,5 @@ set +e
 if ! rpm -q 'puppet-agent'; then
     set -e
     yum install -y puppet-agent
+    reload_shell
 fi
diff --git a/puppeter/persistence/gateway/set-fqdn.sh b/puppeter/persistence/gateway/set-fqdn.sh
@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
-puppet resource host '@{fqdn}' ensure=present host_aliases='@{hostname}' ip=127.0.0.1 comment='FQDN'
-hostname '@{hostname}'
-reload_shell
+if [[ "$(hostname -f)" != '@{fqdn}' ]]; then
+    puppet resource host '@{fqdn}' ensure=present host_aliases='@{hostname}' ip=127.0.0.1 comment='FQDN'
+    hostname '@{hostname}'
+    reload_shell
+fi