diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp index 45b7887..ae62c8f 100644 --- a/modules/rhizo_base/manifests/apt.pp +++ b/modules/rhizo_base/manifests/apt.pp @@ -69,6 +69,16 @@ class rhizo_base::apt::common { require => File['/etc/apt/apt.conf.d/90unsigned'], } + apt::source { 'irontec': + location => 'http://packages.irontec.com/debian', + release => "${lsbdistcodename}", + repos => 'main', + key => { + 'id' => '4FF7139B43073A436D8C2C4F90D20F5ED8C20040', + 'source' => 'http://packages.irontec.com/public.key' + } + } + package { 'apt-transport-https': ensure => installed, } @@ -85,16 +95,6 @@ class rhizo_base::apt::bullseye inherits rhizo_base::apt::buster { class rhizo_base::apt::buster inherits rhizo_base::apt::common { - apt::source { 'irontec': - location => 'http://packages.irontec.com/debian', - release => 'buster', - repos => 'main', - key => { - 'id' => '4FF7139B43073A436D8C2C4F90D20F5ED8C20040', - 'source' => 'http://packages.irontec.com/public.key' - } - } - apt::source { 'osmocom': location => "http://downloads.osmocom.org/packages/osmocom:/${osmo_repo}/Debian_10/", release => './', @@ -130,16 +130,6 @@ class rhizo_base::apt::stretch inherits rhizo_base::apt::common { require => Package['apt-transport-https'], } - apt::source { 'irontec': - location => 'http://packages.irontec.com/debian', - release => 'stretch', - repos => 'main', - key => { - 'id' => '4FF7139B43073A436D8C2C4F90D20F5ED8C20040', - 'source' => 'http://packages.irontec.com/public.key' - } - } - apt::source { 'rhizo-jessie': location => 'http://repo.rhizomatica.org/debian/', release => 'jessie',