From ede8d4980eead476112d774499e3905cd80d7398 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 2 Dec 2015 16:05:39 -0500 Subject: [PATCH] Add support for Ubuntu This is needed to migrate pbx.openstack.org to Ubuntu Trusty. The changes will not affect centos6. Change-Id: I74094e6777ec768bb1ab3f2d480e3eecdb15c363 Depends-On: Id3fc74bf58ba5febac79674e6fd23d6ade3e4bd1 Signed-off-by: Paul Belanger --- files/modules.conf | 2 + manifests/init.pp | 100 ++++++++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 42 deletions(-) diff --git a/files/modules.conf b/files/modules.conf index 1317f75..abbfabd 100644 --- a/files/modules.conf +++ b/files/modules.conf @@ -48,6 +48,8 @@ load => bridge_softmix.so ; Channels load => chan_local.so +; Sadly, this is a hard dependency on Ubuntu Trusty. +load => res_http_websocket load => chan_sip.so ; Codec diff --git a/manifests/init.pp b/manifests/init.pp index 2d4a163..ca6c23c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -25,57 +25,73 @@ class asterisk ( ) { include ::asterisk::server::command - yumrepo { 'asteriskcurrent': - baseurl => 'http://packages.asterisk.org/centos/$releasever/current/$basearch/', - descr => 'Asterisk supporting packages produced by Digium', - enabled => 1, - gpgcheck => 0, - } + if ($::osfamily == 'RedHat') { + yumrepo { 'asteriskcurrent': + baseurl => 'http://packages.asterisk.org/centos/$releasever/current/$basearch/', + descr => 'Asterisk supporting packages produced by Digium', + enabled => 1, + gpgcheck => 0, + } - yumrepo { 'asterisk11': - baseurl => 'http://packages.asterisk.org/centos/$releasever/asterisk-11/$basearch/', - descr => 'Asterisk packages produced by Digium', - enabled => 1, - gpgcheck => 0, - require => Yumrepo['asteriskcurrent'], - } + yumrepo { 'asterisk11': + baseurl => 'http://packages.asterisk.org/centos/$releasever/asterisk-11/$basearch/', + descr => 'Asterisk packages produced by Digium', + enabled => 1, + gpgcheck => 0, + require => Yumrepo['asteriskcurrent'], + } - package { 'asterisknow-version' : - ensure => present, - require => [ - Yumrepo['asteriskcurrent'], - ], - } + package { 'asterisknow-version' : + ensure => present, + require => [ + Yumrepo['asteriskcurrent'], + ], + } - package { 'asterisk' : - ensure => present, - require => [ - Yumrepo['asterisk11'], - Package['asterisknow-version'], - ], + package { 'asterisk' : + ensure => present, + require => [ + Yumrepo['asterisk11'], + Package['asterisknow-version'], + ], + } + $sounds = [ + 'asterisk-sounds-core-en-g722', + 'asterisk-sounds-core-en-ulaw', + 'asterisk-sounds-core-en-gsm', + 'asterisk-sounds-extra-en-ulaw', + 'asterisk-sounds-extra-en-gsm', + 'asterisk-sounds-moh-opsound-wav', + 'asterisk-sounds-moh-opsound-ulaw', + ] + } else { + package { 'asterisk': + ensure => present, + } + $sounds = [ + 'asterisk-core-sounds-en', + # Asterisk sounds extras was deleted in Ubuntu packaging because of + # copyright issues. + #'asterisk-sounds-extra', + 'asterisk-moh-opsound-g722', + 'asterisk-moh-opsound-gsm', + 'asterisk-moh-opsound-wav', + ] } - $sounds = [ - 'asterisk-sounds-core-en-g722', - 'asterisk-sounds-core-en-ulaw', - 'asterisk-sounds-core-en-gsm', - 'asterisk-sounds-extra-en-ulaw', - 'asterisk-sounds-extra-en-gsm', - 'asterisk-sounds-moh-opsound-wav', - 'asterisk-sounds-moh-opsound-ulaw', - ] - package { $sounds : ensure => present, - require => Yumrepo['asteriskcurrent'], + require => Package['asterisk'], } - file { '/etc/asterisk/asterisk.conf': - ensure => present, - owner => 'asterisk', - group => 'asterisk', - mode => '0660', - source => $asterisk_conf_source, + if ($asterisk_conf_source != undef) { + file { '/etc/asterisk/asterisk.conf': + ensure => present, + owner => 'asterisk', + group => 'asterisk', + mode => '0660', + source => $asterisk_conf_source, + } } file { '/etc/asterisk/modules.conf.d/modules.conf':