From 72bde29cc383f4e9c5cc17800c249372135f5e6f Mon Sep 17 00:00:00 2001
From: Monocots <gitmaster@rhizomatica.org>
Date: Fri, 8 May 2020 02:00:50 +0000
Subject: [PATCH] Refresh expired repo signing keys

---
 modules/apt                         |  2 +-
 modules/rhizo_base/manifests/apt.pp | 30 +++++++++++++----------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/modules/apt b/modules/apt
index 21a1264..436aa9f 160000
--- a/modules/apt
+++ b/modules/apt
@@ -1 +1 @@
-Subproject commit 21a1264f9b81950d83da626dc51faa9e45285eab
+Subproject commit 436aa9fb67d238b7a88346d14086c4185ef3f405
diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp
index f1c5677..ed62a8a 100644
--- a/modules/rhizo_base/manifests/apt.pp
+++ b/modules/rhizo_base/manifests/apt.pp
@@ -57,6 +57,18 @@ class rhizo_base::apt::common {
   package { 'apt-transport-https':
       ensure  => installed,
     }
+
+  apt::key { 'freeswitch':
+      id      => '5E098B3D18406E8E19543709BD3189F5A2B57698',
+      source  => 'https://files.freeswitch.org/repo/deb/freeswitch-1.8/fsstretch-archive-keyring.gpg',
+      ensure  => refreshed
+    }
+
+  apt::key { 'opensuse':
+      id      => '0080689BE757A876CB7DC26962EB1A0917280DDF',
+      source  => 'https://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_10/Release.key',
+      ensure  => refreshed
+    }
 }
 
 class rhizo_base::apt::buster inherits rhizo_base::apt::common {
@@ -64,11 +76,7 @@ class rhizo_base::apt::buster inherits rhizo_base::apt::common {
   apt::source { 'freeswitch':
       location    => 'http://files.freeswitch.org/repo/deb/freeswitch-1.8/',
       release     => 'buster',
-      repos       => 'main',
-      key         => {
-         'id'     => '5E098B3D18406E8E19543709BD3189F5A2B57698',
-         'source' => 'https://files.freeswitch.org/repo/deb/freeswitch-1.8/fsstretch-archive-keyring.gpg'
-       }
+      repos       => 'main'
     }
 
   apt::source { 'irontec':
@@ -86,10 +94,6 @@ class rhizo_base::apt::buster inherits rhizo_base::apt::common {
       release     => './',
       repos       => '',
       notify      => Exec['apt_update'],
-      key         => {
-        'id'      => '0080689BE757A876CB7DC26962EB1A0917280DDF',
-        'source'  => "http://download.opensuse.org/repositories/network:/osmocom:/${osmo_repo}/Debian_10/Release.key"
-       }
     }
 }
 
@@ -99,10 +103,6 @@ class rhizo_base::apt::stretch inherits rhizo_base::apt::common {
       location    => 'http://files.freeswitch.org/repo/deb/freeswitch-1.8/',
       release     => 'stretch',
       repos       => 'main',
-      key         => {
-         'id'     => '20B06EE621AB150D40F6079FD76EDC7725E010CF',
-         'source' => 'https://files.freeswitch.org/repo/deb/freeswitch-1.8/key.gpg'
-       }
     }
 
   apt::source { 'nodesource':
@@ -139,10 +139,6 @@ class rhizo_base::apt::stretch inherits rhizo_base::apt::common {
       release     => './',
       repos       => '',
       notify      => Exec['apt_update'],
-      key         => {
-        'id'      => '0080689BE757A876CB7DC26962EB1A0917280DDF',
-        'source'  => "http://download.opensuse.org/repositories/network:/osmocom:/${osmo_repo}/Debian_9.0/Release.key"
-       }
     }
 
    file { [ '/etc/apt/sources.list.d/osmocom-latest.list',