diff options
| author | Jan Dittberner <jandd@cacert.org> | 2019-07-13 16:55:04 +0200 |
|---|---|---|
| committer | Jan Dittberner <jandd@cacert.org> | 2019-07-13 16:57:28 +0200 |
| commit | 9855a34983cca473266a0d7d03f5ed8c07b9ffc8 (patch) | |
| tree | 3cb82cb0a5ee94950bd031cefb74b58fae482fdc | |
| parent | ad7cc682c449709f29a69d509f74b8816ea80686 (diff) | |
| download | cacert-puppet-9855a34983cca473266a0d7d03f5ed8c07b9ffc8.tar.gz cacert-puppet-9855a34983cca473266a0d7d03f5ed8c07b9ffc8.tar.xz cacert-puppet-9855a34983cca473266a0d7d03f5ed8c07b9ffc8.zip | |
Remove blacklist preference for systemd-sysv
Blacklisting systemd is not necessary with Buster on infra02.
| -rw-r--r-- | sitemodules/profiles/files/base/apt_blacklist_systemd-sysv.pref | 3 | ||||
| -rw-r--r-- | sitemodules/profiles/manifests/base.pp | 6 |
2 files changed, 1 insertions, 8 deletions
diff --git a/sitemodules/profiles/files/base/apt_blacklist_systemd-sysv.pref b/sitemodules/profiles/files/base/apt_blacklist_systemd-sysv.pref deleted file mode 100644 index 6c8210b..0000000 --- a/sitemodules/profiles/files/base/apt_blacklist_systemd-sysv.pref +++ /dev/null @@ -1,3 +0,0 @@ -Package: systemd-sysv -Pin: release * -Pin-Priority: -1 diff --git a/sitemodules/profiles/manifests/base.pp b/sitemodules/profiles/manifests/base.pp index 48e0c6f..2b781a5 100644 --- a/sitemodules/profiles/manifests/base.pp +++ b/sitemodules/profiles/manifests/base.pp @@ -158,11 +158,7 @@ class profiles::base ( } file { '/etc/apt/preferences.d/blacklist_systemd-sysv.pref': - ensure => file, - owner => 'root', - group => 'root', - mode => '0644', - source => 'puppet:///modules/profiles/base/apt_blacklist_systemd-sysv.pref', + ensure => absent, } file { '/etc/resolv.conf': |