Merge branch 'whyteks/puppet4-debian' of github.com:Rhizomatica/puppet into whyteks/puppet4-debian

README.md

@@ -6,4 +6,18 @@ This is earmarked to be the future default install. For now it probably does not
 
 Please see the README in the master branch of this repo.
 
+There is one thing you need to do by hand first:
+
+```
+wget http://http.debian.net/debian/pool/main/o/openssl/libssl1.0.0_1.0.1t-1%2bdeb8u7_amd64.deb
+dpkg -i libssl1.0.0_1.0.1t-1+deb8u7_amd64.deb 
+```
+
+
+There is one error:
+
+```
+Error: /Stage[main]/Postgresql::Server::Config/Concat[/etc/postgresql/9.6/main/pg_hba.conf]/Concat_file[/etc/postgresql/9.6/main/pg_hba.conf]: Failed to generate additional resources using 'eval_generate': comparison of Array with Array failed
+```
+
 

modules/ntp

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

modules/rhizo_base/manifests/apt.pp

@@ -19,7 +19,7 @@ class rhizo_base::apt::common {
 
   class { '::apt':
      update => {
-       frequency => 'daily',
+       frequency => 'weekly',
      },
   }
 
@@ -75,8 +75,9 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
       location    => 'http://files.freeswitch.org/repo/deb/freeswitch-1.6/',
       release     => 'jessie',
       repos       => 'main',
+      notify      => Exec['apt_update'],
       key         => {
-         'id'           => '25E010CF',
+         'id'     => '20B06EE621AB150D40F6079FD76EDC7725E010CF',
          'source' => 'http://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub'
        }
     }
@@ -86,7 +87,7 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
       release     => 'jessie',
       repos       => 'main',
       key         => {
-        'id'      => '68576280',
+        'id'      => '9FD3B784BC1C6FC31A8A0A1C1655A0AB68576280',
         'source'  => 'https://deb.nodesource.com/gpgkey/nodesource.gpg.key'
        }
     }
@@ -96,7 +97,7 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
       release     => 'jessie',
       repos       => 'main',
       key         => {
-        'id'      => 'D8C20040',
+        'id'      => '4FF7139B43073A436D8C2C4F90D20F5ED8C20040',
         'source'  => 'http://packages.irontec.com/public.key'
        }
     }
@@ -112,8 +113,9 @@ class rhizo_base::apt::debian inherits rhizo_base::apt::common {
       location    => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/',
       release     => './',
       repos       => '',
+      notify      => Exec['apt_update'],
       key         => {
-        'id'            => '17280DDF',
+        'id'      => '0080689BE757A876CB7DC26962EB1A0917280DDF',
         'source'  => 'http://download.opensuse.org/repositories/network:/osmocom:/nightly/Debian_9.0/Release.key'
        }
     }

modules/rhizo_base/manifests/freeswitch.pp

@@ -39,17 +39,17 @@ class rhizo_base::freeswitch::debian inherits rhizo_base::freeswitch::common {
 
   include systemd
 
+  file { '/usr/lib/freeswitch/mod/mod_g729.so':
+      source  => 'puppet:///modules/rhizo_base/mod_g729.so',
+      require => Package['freeswitch'],
+    }
+
   package {
     [ 'freeswitch-mod-g729' ]:
       ensure  => purged,
       require => Class['rhizo_base::apt'],   
   }
 
-  file { '/usr/lib/freeswitch/mod/mod_cdr_pg_csv.so':
-      source  => 'puppet:///modules/rhizo_base/usr/lib/freeswitch/mod/mod_cdr_pg_csv.so',
-      require => Package['freeswitch'],
-    }
-
   file { '/etc/default/freeswitch':
       source  => 'puppet:///modules/rhizo_base/etc/default/freeswitch',
       require => Package['freeswitch'],
@@ -93,7 +93,7 @@ class rhizo_base::freeswitch::common {
     'freeswitch-mod-b64', 'freeswitch-mod-bv',
     'freeswitch-mod-commands', 'freeswitch-mod-conference',
     'freeswitch-mod-console', 'freeswitch-mod-db',
-    'freeswitch-mod-dialplan-asterisk', 'freeswitch-mod-dialplan-xml',
+    'freeswitch-mod-dialplan-xml',
     'freeswitch-mod-dptools', 'freeswitch-mod-enum',
     'freeswitch-mod-esf', 'freeswitch-mod-event-socket',
     'freeswitch-mod-expr', 'freeswitch-mod-fifo',

modules/rhizo_base/manifests/init.pp

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

modules/rhizo_base/manifests/openbsc.pp

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

modules/rhizo_base/manifests/packages.pp

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