hieradata: Migrate primary Puppet server to puppet-04

Author: supertassu

bin/provision-instance.sh

@@ -31,7 +31,7 @@ ssh root@"$INSTANCE" "$PUPPET" config --section agent set environment "$ENVIRONM
 ssh root@"$INSTANCE" "$PUPPET" agent -t || true
 
 REAL_CSR_FINGERPRINT=$(ssh root@"$INSTANCE" openssl req -in "$SSL_PATH"/certificate_requests/"$INSTANCE".pem -outform der | sha256sum | awk '{ print $1 }' | sed 's/\(..\)/\1:/g; s/:$//; s/./\U&/g;')
-SERVER_CSR_FINGERPRINT=$(ssh "$PUPPET_SERVER" sudo openssl req -in /etc/puppetlabs/puppet/ssl/ca/requests/"$INSTANCE".pem -outform der | sha256sum | awk '{ print $1 }' | sed 's/\(..\)/\1:/g; s/:$//; s/./\U&/g;')
+SERVER_CSR_FINGERPRINT=$(ssh "$PUPPET_SERVER" sudo openssl req -in /etc/puppet/puppetserver/ca/requests/"$INSTANCE".pem -outform der | sha256sum | awk '{ print $1 }' | sed 's/\(..\)/\1:/g; s/:$//; s/./\U&/g;')
 if [ "$REAL_CSR_FINGERPRINT" != "$SERVER_CSR_FINGERPRINT" ]; then
   echo "CSR fingerprint does not match!"
   exit 1

hieradata/common.yaml

@@ -504,7 +504,7 @@ profile::base::groups:
 
 profile::notifier::version: v4.0.1
 
-profile::puppet::agent::ca_server: puppet-03.ops.jquery.net
+profile::puppet::agent::ca_server: puppet-04.ops.jquery.net
 
 # https://github.com/wp-cli/wp-cli/releases
 profile::wordpress::base::wordpress_cli_version: "2.8.1"

hieradata/environments/production/common.yaml

@@ -1,3 +1,3 @@
-profile::puppet::agent::puppet_server: puppet-03.ops.jquery.net
+profile::puppet::agent::puppet_server: puppet-04.ops.jquery.net
 
 profile::certbot::email: [email protected]

modules/profile/manifests/puppet/server.pp

@@ -277,7 +277,7 @@
     user        => 'root',
     description => 'rsync Puppet CA files from the primary server',
     # TODO: stop hardcoding path once fully on Debian 12
-    command     => "/usr/bin/rsync -avp --delete --chown puppet:puppet -e \"/usr/bin/ssh -i /etc/ssh/local_keys.d/puppet-sync\" ${primary_host}:/etc/puppetlabs/puppetserver/ca/ ${server_config_path}/ca/",
+    command     => "/usr/bin/rsync -avp --delete --chown puppet:puppet -e \"/usr/bin/ssh -i /etc/ssh/local_keys.d/puppet-sync\" ${primary_host}:/etc/puppet/puppetserver/ca/ ${server_config_path}/ca/",
     interval    => ['OnCalendar=*-*-* *:4/5:00'],
   }