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:📦:debian class to break a dependency cycle that would otherwise exist if rhizo_base::apt::debian depended on all of rhizo_base:📦:debian.
This commit is contained in:
parent
f1cc836270
commit
57de111236
2 changed files with 7 additions and 2 deletions
|
@ -71,6 +71,10 @@ class rhizo_base::apt::ubuntu inherits rhizo_base::apt::common {
|
||||||
|
|
||||||
class rhizo_base::apt::debian inherits rhizo_base::apt::common {
|
class rhizo_base::apt::debian inherits rhizo_base::apt::common {
|
||||||
|
|
||||||
|
package {'apt-transport-https':
|
||||||
|
ensure => installed,
|
||||||
|
}
|
||||||
|
|
||||||
apt::source { 'freeswitch':
|
apt::source { 'freeswitch':
|
||||||
location => 'http://files.freeswitch.org/repo/deb/freeswitch-1.6/',
|
location => 'http://files.freeswitch.org/repo/deb/freeswitch-1.6/',
|
||||||
release => 'jessie',
|
release => 'jessie',
|
||||||
|
@ -89,7 +93,8 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
|
||||||
key => {
|
key => {
|
||||||
'id' => '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280',
|
'id' => '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280',
|
||||||
'source' => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
|
'source' => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
|
||||||
}
|
},
|
||||||
|
require => Package['apt-transport-https'],
|
||||||
}
|
}
|
||||||
|
|
||||||
apt::source { 'irontec':
|
apt::source { 'irontec':
|
||||||
|
|
|
@ -53,7 +53,7 @@ class rhizo_base::packages::debian inherits rhizo_base::packages::common {
|
||||||
|
|
||||||
package { ['apache2','libapache2-mod-php', 'php', 'php-pgsql',
|
package { ['apache2','libapache2-mod-php', 'php', 'php-pgsql',
|
||||||
'php-curl', 'php-cli', 'php-gd', 'php-intl', 'php-gettext',
|
'php-curl', 'php-cli', 'php-gd', 'php-intl', 'php-gettext',
|
||||||
'sudo', 'apt-transport-https']:
|
'sudo']:
|
||||||
ensure => installed,
|
ensure => installed,
|
||||||
require => Class['rhizo_base::apt'],
|
require => Class['rhizo_base::apt'],
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue