diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2026-01-31 12:41:27 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2026-01-31 12:41:27 -0300 |
| commit | bba55fda49bb11cd0f23ac6fde6becd3aaaac391 (patch) | |
| tree | 58556b4ff3b072b778b3bd29e2595545d11c8646 /lib | |
| parent | c850c699883f4a0c1181063903727bcf639049ca (diff) | |
| download | hydra-bba55fda49bb11cd0f23ac6fde6becd3aaaac391.tar.gz hydra-bba55fda49bb11cd0f23ac6fde6becd3aaaac391.tar.bz2 | |
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/hydra/deploy | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/hydra/deploy b/lib/hydra/deploy index 9f1a0ba..8bbbac2 100644 --- a/lib/hydra/deploy +++ b/lib/hydra/deploy @@ -9,6 +9,12 @@ function hydra_deploy_setup { DEPLOY_RSYNC="rsync -CrltDvpq --no-owner --exclude=/ssl --exclude=logs --exclude=keys --exclude=site_keys --exclude=config/secrets --delete --rsync-path" RSYNC_PATH="rsync -q" + # Puppet 8+ compatibility + # https://github.com/puppetlabs/puppet/wiki/Puppet-8-Compatibility#module-compatibility + # https://github.com/puppetlabs/puppet/blob/main/references/configuration.md#configuration-settings + PUPPET_OPTS="$PUPPET_OPTS --include_legacy_facts" + PUPPET_OPTS="$PUPPET_OPTS --no-strict_variables --strict=warning" + # Ensure keystore existence mkdir -p $HYDRA_FOLDER/puppet/keys @@ -75,9 +81,11 @@ function hydra_deploy_setup { DEPLOY_COMMAND="$SUDO" DEPLOY_RSYNC="" FQDN="`cat /etc/hostname`" - PUPPET_OPTS="--confdir=$HYDRA_FOLDER/puppet --modulepath=$HYDRA_FOLDER/puppet/modules" hydra_deploy_set_manifest $HYDRA_FOLDER || return 1 + # Set configuration and module path + PUPPET_OPTS="$PUPPET_OPTS --confdir=$HYDRA_FOLDER/puppet --modulepath=$HYDRA_FOLDER/puppet/modules" + # Remove old eyaml symlinks if exists if [ -h "$HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem" ]; then rm -f $HYDRA_FOLDER/puppet/keys/private_key.pkcs7.pem |