From 4b53a584948ea99b0615e4bbeb8941dd3cf564b3 Mon Sep 17 00:00:00 2001 From: Keith Whyte Date: Tue, 13 Feb 2018 21:35:33 +0000 Subject: [PATCH] Initial Changes to the manifests, just to get the recipe to run --- modules/rhizo_base/manifests/apt.pp | 52 ++++++++++++++-------- modules/rhizo_base/manifests/freeswitch.pp | 2 +- modules/rhizo_base/manifests/init.pp | 8 +--- modules/rhizo_base/manifests/postgresql.pp | 4 +- 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/modules/rhizo_base/manifests/apt.pp b/modules/rhizo_base/manifests/apt.pp index f590482..8af76d2 100644 --- a/modules/rhizo_base/manifests/apt.pp +++ b/modules/rhizo_base/manifests/apt.pp @@ -18,25 +18,35 @@ class rhizo_base::apt { class rhizo_base::apt::common { class { '::apt': - always_apt_update => false, + update => { + frequency => 'daily', + }, } file { '/etc/apt/apt.conf.d/90unsigned': ensure => present, content => 'APT::Get::AllowUnauthenticated "true";', } + apt::source { 'rhizomatica': location => 'http://dev.rhizomatica.org/ubuntu/', release => 'precise', repos => 'main', - include_src => false, + include => { + 'src' => false, + 'deb' => true, + }, require => File['/etc/apt/apt.conf.d/90unsigned'], } + apt::source { 'rhizo': location => 'http://repo.rhizomatica.org/ubuntu/', release => 'precise', repos => 'main', - include_src => false, + include => { + 'src' => false, + 'deb' => true, + }, require => File['/etc/apt/apt.conf.d/90unsigned'], } @@ -48,19 +58,14 @@ class rhizo_base::apt::ubuntu inherits rhizo_base::apt::common { apt::ppa { 'ppa:ondrej/php': } apt::ppa { 'ppa:ondrej/apache2': } - apt::source { 'icinga': - location => 'https://packages.icinga.org/ubuntu', - release => 'icinga-precise', - repos => 'main', - key_source => 'https://packages.icinga.org/icinga.key', - include_src => false, - } - apt::source { 'nodesource': location => 'https://deb.nodesource.com/node_0.10', release => 'precise', repos => 'main', - key_source => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key' + key => { + 'id' => '68576280', + 'source' => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key' + } } } @@ -70,29 +75,36 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common { location => 'http://files.freeswitch.org/repo/deb/freeswitch-1.6/', release => 'jessie', repos => 'main', - include_src => false, - key_source => 'http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub' + key => { + 'id' => '25E010CF', + 'source' => 'http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub' + } } apt::source { 'nodesource': location => 'https://deb.nodesource.com/node_0.10', release => 'jessie', repos => 'main', - key_source => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key' + key => { + 'id' => '68576280', + 'source' => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key' + } } apt::source { 'irontec': location => 'http://packages.irontec.com/debian', release => 'jessie', repos => 'main', - key_source => 'http://packages.irontec.com/public.key' + key => { + 'id' => 'D8C20040', + 'source' => 'http://packages.irontec.com/public.key' + } } apt::source { 'rhizo-jessie': location => 'http://repo.rhizomatica.org/debian/', release => 'jessie', repos => 'main', - include_src => false, require => File['/etc/apt/apt.conf.d/90unsigned'], } @@ -100,7 +112,9 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common { location => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/', release => './', repos => '', - include_src => false, - key_source => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/Release.key' + key => { + 'id' => '17280DDF', + 'source' => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_8.0/Release.key' + } } } diff --git a/modules/rhizo_base/manifests/freeswitch.pp b/modules/rhizo_base/manifests/freeswitch.pp index 098fcea..01a8740 100644 --- a/modules/rhizo_base/manifests/freeswitch.pp +++ b/modules/rhizo_base/manifests/freeswitch.pp @@ -179,4 +179,4 @@ class rhizo_base::freeswitch::common { require => File['/root/.ssh/bsc_dev'], } -} \ No newline at end of file +} diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp index a715ead..6500ab4 100644 --- a/modules/rhizo_base/manifests/init.pp +++ b/modules/rhizo_base/manifests/init.pp @@ -14,7 +14,6 @@ class rhizo_base { $mail_admins = hiera('rhizo::mail_admins') $smsc_password = hiera('rhizo::smsc_password') - $kannel_admin_password = hiera('rhizo::kannel_admin_password') $password_hash = hiera('rhizo::password_hash') # Configuration settings @@ -85,11 +84,6 @@ class rhizo_base { $rai_admin_user = hiera('rhizo::rai_admin_user') $rai_admin_pwd = hiera('rhizo::rai_admin_pwd') - $kannel_server = hiera('rhizo::kannel_server') - $kannel_port = hiera('rhizo::kannel_port') - $kannel_username = hiera('rhizo::kannel_username') - $kannel_sendsms_password = hiera('rhizo::kannel_sendsms_password') - # VOIP provider $voip_provider_name = hiera('rhizo::voip_provider_name') $voip_username = hiera('rhizo::voip_username') @@ -149,7 +143,6 @@ class rhizo_base { $link5_geo_lon = hiera('rhizo::link5_geo_lon', false) include ntp - include kannel include sshkeys include rhizo_base::fixes include rhizo_base::apt @@ -161,6 +154,7 @@ class rhizo_base { include rhizo_base::lcr include rhizo_base::sudo include rhizo_base::users + if $operatingsystem != 'Debian' { include rhizo_base::icinga } diff --git a/modules/rhizo_base/manifests/postgresql.pp b/modules/rhizo_base/manifests/postgresql.pp index 3517787..0216b11 100644 --- a/modules/rhizo_base/manifests/postgresql.pp +++ b/modules/rhizo_base/manifests/postgresql.pp @@ -44,9 +44,9 @@ class rhizo_base::postgresql::debian inherits rhizo_base::postgresql::common { class { 'postgresql::globals': manage_package_repo => true, - version => '9.4', + version => '9.6', }-> class { 'postgresql::server': } -} \ No newline at end of file +}