keith/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Test #1 for error free 1st run

Browse source
This commit is contained in:
Keith Whyte 2018-02-23 11:25:10 +00:00
parent 3326f105f1
commit 53ba6815a3
6 changed files with 36 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/ntp

@ -1 +1 @@
Subproject commit 1f519f719552aedc98b6995e42d23201a0286a58 Subproject commit 93da3bd01a5ae4276eddec15ac615eb4bccc23cf

46
modules/rhizo_base/manifests/apt.pp
View file

@ -19,7 +19,7 @@ class rhizo_base::apt::common {
class { '::apt': class { '::apt':
update => { update => {
frequency => 'daily', frequency => 'weekly',
}, },
} }
@ -72,12 +72,13 @@ 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 {
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',
repos => 'main', repos => 'main',
key => { notify => Exec['apt_update'],
'id' => '25E010CF', key => {
'source' => 'http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub' 'id' => '20B06EE621AB150D40F6079FD76EDC7725E010CF',
'source' => 'http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub'
} }
} }
@ -86,9 +87,9 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
release => 'jessie', release => 'jessie',
repos => 'main', repos => 'main',
key => { key => {
'id' => '68576280', 'id' => '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280',
'source' => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key' 'source' => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
} }
} }
apt::source { 'irontec': apt::source { 'irontec':
@ -96,25 +97,26 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
release => 'jessie', release => 'jessie',
repos => 'main', repos => 'main',
key => { key => {
'id' => 'D8C20040', 'id' => '4FF7139B43073A436D8C2C4F90D20F5ED8C20040',
'source' => 'http://packages.irontec.com/public.key' 'source' => 'http://packages.irontec.com/public.key'
} }
} }
apt::source { 'rhizo-jessie': apt::source { 'rhizo-jessie':
location => 'http://repo.rhizomatica.org/debian/', location => 'http://repo.rhizomatica.org/debian/',
release => 'jessie', release => 'jessie',
repos => 'main', repos => 'main',
require => File['/etc/apt/apt.conf.d/90unsigned'], require => File['/etc/apt/apt.conf.d/90unsigned'],
} }
apt::source { 'osmocom-nightly': apt::source { 'osmocom-nightly':
location => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/', location => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/',
release => './', release => './',
repos => '', repos => '',
key => { notify => Exec['apt_update'],
'id' => '17280DDF', key => {
'source' => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/Release.key' 'id' => '0080689BE757A876CB7DC26962EB1A0917280DDF',
} 'source' => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/Release.key'
}
} }
} }

5
modules/rhizo_base/manifests/freeswitch.pp
View file

@ -45,8 +45,8 @@ class rhizo_base::freeswitch::debian inherits rhizo_base::freeswitch::common {
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
} }
file { '/usr/lib/freeswitch/mod/mod_cdr_pg_csv.so': file { '/usr/lib/freeswitch/mod/mod_g729.so':
source => 'puppet:///modules/rhizo_base/usr/lib/freeswitch/mod/mod_cdr_pg_csv.so', source => 'puppet:///modules/rhizo_base/mod_g729.so',
require => Package['freeswitch'], require => Package['freeswitch'],
} }
@ -59,6 +59,7 @@ class rhizo_base::freeswitch::debian inherits rhizo_base::freeswitch::common {
ensure => directory, ensure => directory,
owner => 'freeswitch', owner => 'freeswitch',
group => 'freeswitch', group => 'freeswitch',
require => Package['freeswitch']
} }
systemd::unit_file { 'freeswitch.service': systemd::unit_file { 'freeswitch.service':

11
modules/rhizo_base/manifests/init.pp
View file

@ -146,19 +146,19 @@ class rhizo_base {
include sshkeys include sshkeys
include rhizo_base::fixes include rhizo_base::fixes
include rhizo_base::apt include rhizo_base::apt
include rhizo_base::postgresql include rhizo_base::users
include rhizo_base::packages include rhizo_base::packages
include rhizo_base::postgresql
include rhizo_base::freeswitch include rhizo_base::freeswitch
include rhizo_base::runit include rhizo_base::runit
include rhizo_base::openbsc include rhizo_base::openbsc
include rhizo_base::lcr include rhizo_base::lcr
include rhizo_base::sudo include rhizo_base::sudo
include rhizo_base::users include rhizo_base::kiwi
if $operatingsystem != 'Debian' { if $operatingsystem != 'Debian' {
include rhizo_base::icinga include rhizo_base::icinga
} }
include rhizo_base::kiwi
if $vpn_ip_address == $riak_ip_address { if $vpn_ip_address == $riak_ip_address {
if $operatingsystem != 'Debian' { if $operatingsystem != 'Debian' {
@ -183,7 +183,6 @@ class rhizo_base {
value => '1' value => '1'
} }
#Rhizomatica scripts #Rhizomatica scripts
file { '/home/rhizomatica/bin': file { '/home/rhizomatica/bin':
ensure => directory, ensure => directory,
@ -224,7 +223,9 @@ class rhizo_base {
ensure => directory, ensure => directory,
owner => 'postgres', owner => 'postgres',
group => 'postgres', group => 'postgres',
require => File['/var/rhizo_backups'], require => [ File['/var/rhizo_backups'],
Class['rhizo_base::postgresql']
]
} }
file { '/var/rhizo_backups/sqlite': file { '/var/rhizo_backups/sqlite':

9
modules/rhizo_base/manifests/openbsc.pp
View file

@ -25,12 +25,6 @@ class rhizo_base::openbsc {
$bts3_ip_address = $rhizo_base::bts3_ip_address $bts3_ip_address = $rhizo_base::bts3_ip_address
$smsc_password = $rhizo_base::smsc_password $smsc_password = $rhizo_base::smsc_password
package { [ 'libsmpp0', ]:
ensure => latest,
require => Class['rhizo_base::apt'],
notify => [ Exec['notify-nitb'] ],
}
package { [ 'osmocom-nitb' ]: package { [ 'osmocom-nitb' ]:
ensure => 'latest', ensure => 'latest',
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
@ -38,7 +32,7 @@ class rhizo_base::openbsc {
Exec['notify-nitb'] ], Exec['notify-nitb'] ],
} }
package { [ 'libosmoabis3', package { [ 'libsmpp34-0', 'libosmoabis3',
'libosmoctrl0', 'libosmoctrl0',
'libosmogsm6', 'libosmogsm7', 'libosmogsm6', 'libosmogsm7',
'libosmovty3', 'libosmovty3',
@ -50,6 +44,7 @@ class rhizo_base::openbsc {
'libosmo-sccp-dbg', 'libosmo-sccp-dev', 'libosmo-sccp-dbg', 'libosmo-sccp-dev',
'libosmocodec0', 'libosmocore', 'libosmocodec0', 'libosmocore',
'libosmocore-dbg', 'libosmocore-dev', 'libosmocore-dbg', 'libosmocore-dev',
'libosmocore6', 'libosmogsm5',
'libosmocore-utils', 'libosmogb3', 'libosmocore-utils', 'libosmogb3',
'libosmonetif2', 'libosmosim0', 'libosmonetif2', 'libosmosim0',
'libosmotrau0']: 'libosmotrau0']:

6
modules/rhizo_base/manifests/packages.pp
View file

@ -14,13 +14,8 @@ class rhizo_base::packages {
include "rhizo_base::packages::$operatingsystem" include "rhizo_base::packages::$operatingsystem"
} }
class rhizo_base::packages::common { class rhizo_base::packages::common {
package { [ 'python-python-smpplib' ]:
ensure => purged
}
package { ['mosh', 'git', 'openvpn', 'lm-sensors', 'runit-systemd', 'sqlite3', package { ['mosh', 'git', 'openvpn', 'lm-sensors', 'runit-systemd', 'sqlite3',
'libffi-dev', 'apcupsd', 'expect', 'gawk', 'swig', 'g++', 'libffi-dev', 'apcupsd', 'expect', 'gawk', 'swig', 'g++',
'libcdk5' , 'sngrep', 'rrdtool', 'dnsmasq', 'joe', 'libcdk5' , 'sngrep', 'rrdtool', 'dnsmasq', 'joe',
@ -29,7 +24,6 @@ class rhizo_base::packages::common {
ensure => installed, ensure => installed,
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
} }
} }
class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common { class rhizo_base::packages::ubuntu inherits rhizo_base::packages::common {