diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-02-01 15:22:48 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2022-02-01 15:22:48 +0100 |
| commit | 1d9c643f3ee78be775edb1a293994b8130c77336 (patch) | |
| tree | 7e0ba279b2585a727dfb98d71741a1313d9c2908 /code | |
| parent | f4c8d1c10914c831d20412e7c51c59d8d0b87d25 (diff) | |
| download | puppet.KATH-1d9c643f3ee78be775edb1a293994b8130c77336.tar.gz puppet.KATH-1d9c643f3ee78be775edb1a293994b8130c77336.tar.bz2 puppet.KATH-1d9c643f3ee78be775edb1a293994b8130c77336.zip | |
site.pp: Enable /debian-security URLs as used in bullseye and later, use same apt_origins for all systems on the network.
Diffstat (limited to 'code')
| -rw-r--r-- | code/environments/production/manifests/site.pp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp index 49f1251..0194d5b 100644 --- a/code/environments/production/manifests/site.pp +++ b/code/environments/production/manifests/site.pp @@ -3,13 +3,9 @@ include apt $apt_origins = [ 'origin=Debian,n=${distro_codename}', 'origin=Debian,n=${distro_codename}-updates', - 'origin=Debian,n=${distro_codename},l=Debian-Security', - 'origin=IT-Zukunft Schule,n=${distro_codename},l=IT-Zukunft Schule', -] - -$apt_origins_tablets = [ - 'origin=fai-mirror,n=cskoeln', - 'origin=IT-Zukunft Schule,n=${distro_codename},l=IT-Zukunft Schule', + 'origin=Debian,n=${distro_codename},label=Debian-Security', + 'origin=Debian,n=${distro_codename}-security,label=Debian-Security', + 'origin=IT-Zukunft Schule,n=${distro_codename},label=IT-Zukunft Schule', ] class ssh_pubkeys_admins { @@ -728,7 +724,7 @@ node /(tab[0-9]+|test-fai-installation-tablet)\.intern$/ { class { 'fsautoresizetab': } class { 'unattended_upgrades': enable => 1, - origins => $apt_origins_tablets, + origins => $apt_origins, auto => { 'clean' => 7, }, |