... | ... | @@ -130,6 +130,7 @@ See the "conflicts resolution" section below for how to handle |
|
|
read -n1 -s -r -p "Press any key to continue, Ctrl-C to abort." &&
|
|
|
(puppet agent -t || true) &&
|
|
|
(puppet agent -t || true) &&
|
|
|
rm -f /etc/apt/apt.conf.d/50unattended-upgrades.dpkg-dist /etc/bacula/bacula-fd.conf.ucf-dist /etc/ca-certificates.conf.dpkg-old /etc/cron.daily/bsdmainutils.dpkg-remove /etc/default/prometheus-apache-exporter.dpkg-dist /etc/default/prometheus-node-exporter.dpkg-dist /etc/ldap/ldap.conf.dpkg-dist /etc/logrotate.d/apache2.dpkg-dist /etc/nagios/nrpe.cfg.dpkg-dist /etc/ssh/ssh_config.dpkg-dist /etc/ssh/sshd_config.ucf-dist /etc/sudoers.dpkg-dist /etc/syslog-ng/syslog-ng.conf.dpkg-dist /etc/unbound/unbound.conf.dpkg-dist
|
|
|
printf "\a" &&
|
|
|
/usr/local/sbin/clean_conflicts &&
|
|
|
systemctl start apt-daily.timer &&
|
... | ... | @@ -174,24 +175,12 @@ those prompts. |
|
|
/etc/default/grub.dpkg-dist
|
|
|
/etc/initramfs-tools/initramfs.conf.dpkg-dist
|
|
|
|
|
|
* the following files can be safely removed (answer `n`):
|
|
|
|
|
|
/etc/apt/apt.conf.d/50unattended-upgrades.dpkg-dist
|
|
|
/etc/bacula/bacula-fd.conf.ucf-dist
|
|
|
/etc/ca-certificates.conf.dpkg-old
|
|
|
/etc/cron.daily/bsdmainutils.dpkg-remove
|
|
|
/etc/default/prometheus-apache-exporter.dpkg-dist
|
|
|
/etc/default/prometheus-node-exporter.dpkg-dist
|
|
|
/etc/ldap/ldap.conf.dpkg-dist
|
|
|
/etc/logrotate.d/apache2.dpkg-dist
|
|
|
/etc/nagios/nrpe.cfg.dpkg-dist
|
|
|
/etc/ssh/ssh_config.dpkg-dist
|
|
|
/etc/ssh/sshd_config.ucf-dist
|
|
|
/etc/sudoers.dpkg-dist
|
|
|
/etc/syslog-ng/syslog-ng.conf.dpkg-dist
|
|
|
/etc/unbound/unbound.conf.dpkg-dist
|
|
|
|
|
|
Other unresolved files are noted in the Issues section below.
|
|
|
If other files come up, they should be added in the above decision
|
|
|
list, or in an operation in step 2 or 7 of the above procedure, before
|
|
|
the `clean_conflicts` call.
|
|
|
|
|
|
Files that should be updated in Puppet are mentioned in the Issues
|
|
|
section below as well.
|
|
|
|
|
|
# Service-specific upgrade procedures
|
|
|
|
... | ... | |