From 2caddfe2e892bac4ad6f7888f9006d58f48bf9c3 Mon Sep 17 00:00:00 2001 From: Johan Wassberg Date: Mon, 22 Jan 2024 10:11:45 +0100 Subject: [PATCH] Messes with 22.04 which as default doesn't have /usr/lib/ruby/vendor_ruby/gpgme.rb --- global/post-tasks.d/029hiera-config | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100755 global/post-tasks.d/029hiera-config diff --git a/global/post-tasks.d/029hiera-config b/global/post-tasks.d/029hiera-config deleted file mode 100755 index 5c16ecaf..00000000 --- a/global/post-tasks.d/029hiera-config +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -# Choose hiera config file based on available secrets backend -# - -if [ -f /usr/bin/eyaml -a ! -f /usr/lib/ruby/vendor_ruby/gpgme.rb ]; then - # The package hiera-eyaml is installed, and there is no hiera-gpg. Use heira-eyaml.yaml if it exists. - fn='/etc/puppet/hiera-eyaml.yaml' - test -f "${fn}" && ln -sf "${fn}" /etc/puppet/hiera.yaml -elif [ ! -f /etc/puppet/hiera.yaml ]; then - # If there is no /etc/puppet/hiera.yaml, try to symlink it to the default - fn='/etc/puppet/hiera-default.yaml' - test -f "${fn}" && ln -sf "${fn}" /etc/puppet/hiera.yaml -fi