update csr_attributes

voxpupuli · Apr 18, 2024 · 181377c · 181377c
1 parent 7cf7786
commit 181377c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/puppetserver/docker-entrypoint.d/89-csr_attributes.rb b/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
diff --git a/puppetserver/docker-entrypoint.d/89-csr_attributes.sh b/puppetserver/docker-entrypoint.d/89-csr_attributes.sh
@@ -2,5 +2,5 @@
 
 set -e
 
-echo $CSR_ATTRIBUTES
+echo "CSR Attributes: ${CSR_ATTRIBUTES}"
 /opt/puppetlabs/puppet/bin/ruby /docker-entrypoint.d/89-csr_attributes.rb