From 57de1112367bb4190a841af679ed5289faf5f55c Mon Sep 17 00:00:00 2001
From: Matt Johnson <matt9j@cs.washington.edu>
Date: Sun, 14 Jul 2019 23:16:10 -0500
Subject: [PATCH] rhizo_base: Require apt-transport-https before apt sources

The package apt-transport-https is required to successfully add some
of the debian repos. This commit moves the package resource
installation into the rhizo_base::apt::debian class instead of the
rhizo_base::package::debian class to break a dependency cycle that
would otherwise exist if rhizo_base::apt::debian depended on all of
rhizo_base::package::debian.
---
 modules/rhizo_base/manifests/apt.pp      | 7 ++++++-
 modules/rhizo_base/manifests/packages.pp | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp
index a94252f..dd9accf 100644
--- a/modules/rhizo_base/manifests/apt.pp
+++ b/modules/rhizo_base/manifests/apt.pp
@@ -71,6 +71,10 @@ class rhizo_base::apt::ubuntu inherits rhizo_base::apt::common {
 
 class rhizo_base::apt::debian inherits rhizo_base::apt::common {
 
+  package {'apt-transport-https':
+      ensure  => installed,
+    }
+
   apt::source { 'freeswitch':
       location    => 'http://files.freeswitch.org/repo/deb/freeswitch-1.6/',
       release     => 'jessie',
@@ -89,7 +93,8 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
       key         => {
         'id'      => '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280',
         'source'  => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
-       }
+      },
+      require     => Package['apt-transport-https'],
     }
 
   apt::source { 'irontec':
diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp
index a98b4bd..93ab848 100644
--- a/modules/rhizo_base/manifests/packages.pp
+++ b/modules/rhizo_base/manifests/packages.pp
@@ -53,7 +53,7 @@ class rhizo_base::packages::debian inherits rhizo_base::packages::common {
 
   package { ['apache2','libapache2-mod-php', 'php', 'php-pgsql',
   'php-curl', 'php-cli', 'php-gd', 'php-intl', 'php-gettext',
-  'sudo', 'apt-transport-https']:
+  'sudo']:
       ensure  => installed,
       require => Class['rhizo_base::apt'],
     }