From 7f593391e58952ee26fcaed078f43a42ac988c8b Mon Sep 17 00:00:00 2001 From: racitup Date: Thu, 26 Mar 2020 05:28:28 +0000 Subject: [PATCH] Update ubuntu install config for 18.04 (#309) * Update ubuntu install config for 18.04 * Sync with debian letsencrypt.sh changes * Update git repo for dehydrated --- ubuntu/resources/config.sh | 2 +- ubuntu/resources/letsencrypt.sh | 10 +++++----- ubuntu/resources/switch/source-release.sh | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ubuntu/resources/config.sh b/ubuntu/resources/config.sh index 93066e2..7aa9e23 100755 --- a/ubuntu/resources/config.sh +++ b/ubuntu/resources/config.sh @@ -9,7 +9,7 @@ system_branch=master # master, stable switch_branch=stable # master, stable switch_source=true # true or false switch_package=false # true or false -switch_version=1.10.1 # only for source +switch_version=1.10.2 # only for source switch_tls=true # true or false # Database Settings diff --git a/ubuntu/resources/letsencrypt.sh b/ubuntu/resources/letsencrypt.sh index 915e7d1..31d1515 100755 --- a/ubuntu/resources/letsencrypt.sh +++ b/ubuntu/resources/letsencrypt.sh @@ -4,7 +4,7 @@ # Mark J Crane # Copyright (C) 2018 # All Rights Reserved. - + #move to script directory so all relative paths work cd "$(dirname "$0")" @@ -23,7 +23,7 @@ read -p 'Domain Name: ' domain_name read -p 'Email Address: ' email_address #get and install dehydrated -cd /usr/src && git clone https://github.com/lukas2511/dehydrated.git +cd /usr/src && git clone https://github.com/dehydrated-io/dehydrated.git cd /usr/src/dehydrated cp dehydrated /usr/local/sbin mkdir -p /var/www/dehydrated @@ -58,8 +58,8 @@ cp docs/examples/config /etc/dehydrated #update the dehydrated config #sed "s#CONTACT_EMAIL=#CONTACT_EMAIL=$email_address" -i /etc/dehydrated/config -sed -i' ' -e s:'#CONTACT_EMAIL=":CONTACT_EMAIL=$email_address:' /etc/dehydrated/config -sed -i' ' -e s:'#WELLKNOWN="/var/www/dehydrated":WELLKNOWN="/var/www/dehydrated":' /etc/dehydrated/config +sed -i 's/#CONTACT_EMAIL=/CONTACT_EMAIL="'"$email_address"'"/g' /etc/dehydrated/config +sed -i 's/#WELLKNOWN=/WELLKNOWN=/g' /etc/dehydrated/config #accept the terms dehydrated --register --accept-terms --config /etc/dehydrated/config @@ -124,4 +124,4 @@ if [ .$switch_tls = ."true" ]; then #set the permissions chown -R www-data:www-data /etc/freeswitch/tls -fi +fi diff --git a/ubuntu/resources/switch/source-release.sh b/ubuntu/resources/switch/source-release.sh index cdc749a..3b5ee9a 100755 --- a/ubuntu/resources/switch/source-release.sh +++ b/ubuntu/resources/switch/source-release.sh @@ -15,6 +15,7 @@ apt install -y pkg-config flac libgdbm-dev libdb-dev gettext sudo equivs mlocat apt install -y liblua5.2-dev libtiff5-dev libperl-dev libcurl4-openssl-dev libsqlite3-dev libpcre3-dev apt install -y devscripts libspeexdsp-dev libspeex-dev libldns-dev libedit-dev libopus-dev libmemcached-dev apt install -y libshout3-dev libmpg123-dev libmp3lame-dev yasm nasm libsndfile1-dev libuv1-dev libvpx-dev libvpx5 +apt install -y libavformat-dev libswscale-dev # additional dependencies apt install -y swig3.0 unzip sox wget