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

Fix up Freeswitch versions

Browse source 
Ensure correct pinning and recipies to install rhizomatica compiled versions
This commit is contained in:
Monocots 2022-10-25 15:30:20 +00:00
parent 1ad6cac8bb
commit 5f53f34de6
5 changed files with 18 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,8 +17,11 @@ class rhizo_base::apt {
class rhizo_base::apt::common { class rhizo_base::apt::common {
$osmo_repo = hiera('rhizo::osmo_repo', 'latest')
$fs_pin = hiera('rhizo::fs_pin', '1.10.3*') $fs_version = "${lsbdistcodename}" ? {
'buster' => '1.8.6',
'stretch' => '1.6.20',
}
class { '::apt': class { '::apt':
update => { update => {

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

@ -118,18 +118,10 @@ class rhizo_base::freeswitch::common {
$reg_provider = $rhizo_base::reg_provider $reg_provider = $rhizo_base::reg_provider
$mncc_ip_address = $rhizo_base::mncc_ip_address $mncc_ip_address = $rhizo_base::mncc_ip_address
$fs_ensure = hiera('rhizo::fs_version', 'present') $fs_version = "${lsbdistcodename}" ? {
$fs_deb_version = "${lsbdistcodename}_${fs_ensure}" ? { 'buster' => '1.8.6',
'buster_1.8.6' => '1.8.6', 'stretch' => '1.6.20',
'stretch_1.6.20:' => '1.6.20',
default => '1.10.3~release~15~129de34d84~$lsbdistcodename-1~$lsbdistcodename+1'
} }
$fs_lib_version = "${lsbdistcodename}_${fs_ensure}" ? {
'buster_1.8.6' => '1.8.6',
'stretch_1.6.20:' => '1.6.20',
default => '1.10.3'
}
package { package {
[ [
'freeswitch-mod-b64', 'freeswitch-mod-b64',
@ -144,7 +136,8 @@ class rhizo_base::freeswitch::common {
} }
package { package {
['freeswitch-mod-amr', 'freeswitch-mod-amrwb', ['freeswitch', 'libfreeswitch1', 'freeswitch-lang-en',
'freeswitch-mod-amr', 'freeswitch-mod-amrwb',
'freeswitch-mod-commands', 'freeswitch-mod-commands',
'freeswitch-mod-console', 'freeswitch-mod-db', 'freeswitch-mod-console', 'freeswitch-mod-db',
'freeswitch-mod-dialplan-xml', 'freeswitch-mod-dptools', 'freeswitch-mod-dialplan-xml', 'freeswitch-mod-dptools',
@ -159,17 +152,13 @@ class rhizo_base::freeswitch::common {
'freeswitch-mod-sndfile', 'freeswitch-mod-sofia', 'freeswitch-mod-sndfile', 'freeswitch-mod-sofia',
'freeswitch-mod-shout', 'freeswitch-mod-tone-stream', 'freeswitch-mod-shout', 'freeswitch-mod-tone-stream',
'freeswitch-mod-voicemail', 'freeswitch-mod-voicemail-ivr', 'freeswitch-mod-voicemail', 'freeswitch-mod-voicemail-ivr',
'freeswitch-mod-cdr-pg-csv', 'freeswitch-mod-cdr-pg-csv', 'freeswitch-mod-spandsp' ]:
'libfreeswitch1', 'freeswitch-mod-spandsp', ensure => $fs_version,
'freeswitch-sounds-es-mx-maria' ]:
ensure => installed,
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
} }
package { 'freeswitch-sounds-es-mx-maria':
package { ensure => installed,
['freeswitch', 'freeswitch-lang-en']: require => Package['freeswitch']
ensure => $fs_ensure,
require => Class['rhizo_base::apt'],
} }
unless ($rhizo_base::osmo_stack == "split") { unless ($rhizo_base::osmo_stack == "split") {

2
modules/rhizo_base/templates/buster-pinning.pref.erb
View file

@ -1,5 +1,5 @@
Package: freeswitch* libfreeswitch* Package: freeswitch* libfreeswitch*
Pin: version <%= @fs_pin %> Pin: version <%= @fs_version %>
Pin-Priority: 510 Pin-Priority: 510
Package: postgresql-*-9.6 Package: postgresql-*-9.6

2
modules/rhizo_base/templates/fs_ensure.erb
View file

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
dpkg -l | egrep freeswitch-mod\|libfreeswitch | cut -f3 -d\ |\ dpkg -l | egrep freeswitch-mod\|libfreeswitch | cut -f3 -d\ |\
sed 's/\(.*\)/\1=<%= @fs_deb_version %>/' | sort -r |\ sed 's/\(.*\)/\1=<%= @fs_version %>/' | sort -r |\
sudo xargs -p apt install --assume-yes --allow-downgrades sudo xargs -p apt install --assume-yes --allow-downgrades

2
modules/rhizo_base/templates/stretch-pinning.pref.erb
View file

@ -1,5 +1,5 @@
Package: freeswitch* libfreeswitch* Package: freeswitch* libfreeswitch*
Pin: version <%= @fs_pin %> Pin: version <%= @fs_version %>
Pin-Priority: 510 Pin-Priority: 510
Package: postgresql-*-9.6 Package: postgresql-*-9.6