summaryrefslogtreecommitdiff
path: root/puppet
diff options
context:
space:
mode:
authorVarac <varac@leap.se>2018-03-20 20:39:08 +0100
committerVarac <varac@leap.se>2018-06-12 17:11:40 +0200
commite5f394ee5b241c37a768e5436051faffbf19a15a (patch)
treec094b1f711d2653ab66f4b60b9789f5774a3457c /puppet
parent31a266c0ba60df121fba3a800cc6f623efe9d616 (diff)
Bug: Directly deploy leap-archive keyrings
The leap-archive keyring expired March 8th 2018. We updated it, and published updated installation docs at https://bitmask.net/en/install/linux. For jessie, we dont install the leap-archive-keyring package anymore but directly deploy the keys to apt's trusted keystore. - Fixes: https://0xacab.org/leap/bitmask-dev/issues/9279
Diffstat (limited to 'puppet')
-rw-r--r--puppet/modules/site_apt/files/keys/leap-archive.gpgbin20188 -> 21915 bytes
-rw-r--r--puppet/modules/site_apt/files/keys/leap-experimental-archive.gpgbin3423 -> 5177 bytes
-rw-r--r--puppet/modules/site_apt/manifests/leap_repo.pp14
3 files changed, 10 insertions, 4 deletions
diff --git a/puppet/modules/site_apt/files/keys/leap-archive.gpg b/puppet/modules/site_apt/files/keys/leap-archive.gpg
index dd7f3be6..dc19f623 100644
--- a/puppet/modules/site_apt/files/keys/leap-archive.gpg
+++ b/puppet/modules/site_apt/files/keys/leap-archive.gpg
Binary files differ
diff --git a/puppet/modules/site_apt/files/keys/leap-experimental-archive.gpg b/puppet/modules/site_apt/files/keys/leap-experimental-archive.gpg
index 5cc9064b..19e6ba1f 100644
--- a/puppet/modules/site_apt/files/keys/leap-experimental-archive.gpg
+++ b/puppet/modules/site_apt/files/keys/leap-experimental-archive.gpg
Binary files differ
diff --git a/puppet/modules/site_apt/manifests/leap_repo.pp b/puppet/modules/site_apt/manifests/leap_repo.pp
index 1e18b441..d3ab463d 100644
--- a/puppet/modules/site_apt/manifests/leap_repo.pp
+++ b/puppet/modules/site_apt/manifests/leap_repo.pp
@@ -21,13 +21,19 @@ class site_apt::leap_repo {
}
}
+ file {
+ '/etc/apt/trusted.gpg.d/leap-archive.gpg':
+ ensure => present,
+ source => 'puppet:///modules/site_apt/keys/leap-archive.gpg';
+ '/etc/apt/trusted.gpg.d/leap-experimental-archive.gpg':
+ ensure => present,
+ source => 'puppet:///modules/site_apt/keys/leap-experimental-archive.gpg'
+ }
+
+
apt::sources_list { 'leap.list':
content => "deb [signed-by=${archive_key}] ${::site_apt::apt_url_platform_basic} ${::site_apt::apt_platform_component} ${::site_apt::apt_platform_codename}\n",
before => Exec[refresh_apt]
}
- package { 'leap-archive-keyring':
- ensure => latest
- }
-
}