From ed71dd91253e4a6fdbbb1bc93b5e387f6ffb31b6 Mon Sep 17 00:00:00 2001 From: Len Date: Tue, 14 Jun 2016 20:59:45 -0400 Subject: [PATCH 01/57] rewrite rule fix for yealink common (#23) added .cfg on line 61 --- debian/resources/nginx/fusionpbx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/resources/nginx/fusionpbx b/debian/resources/nginx/fusionpbx index 3f3122b..bb44bd5 100644 --- a/debian/resources/nginx/fusionpbx +++ b/debian/resources/nginx/fusionpbx @@ -58,7 +58,7 @@ server { #rewrite "^.*/provision/([A-Fa-f0-9]{12})(\.(cfg))?$" /app/provision/?mac=$1 last; #yealink common - rewrite "^.*/provision/(y[0-9]{12})(\.cfg)?$" /app/provision/index.php?file=$1; + rewrite "^.*/provision/(y[0-9]{12})(\.cfg)?$" /app/provision/index.php?file=$1.cfg; #yealink mac rewrite "^.*/provision/([A-Fa-f0-9]{12})(\.(xml|cfg))?$" /app/provision/index.php?mac=$1 last; From 3bf249ac43330f2eeb076cf844e43c3a62d4de94 Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Thu, 30 Jun 2016 17:13:55 +0300 Subject: [PATCH 02/57] Fix. Bun IP requests (#25) --- debian/resources/fail2ban/freeswitch-ip.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/resources/fail2ban/freeswitch-ip.conf b/debian/resources/fail2ban/freeswitch-ip.conf index bb5222d..3fee3b6 100644 --- a/debian/resources/fail2ban/freeswitch-ip.conf +++ b/debian/resources/fail2ban/freeswitch-ip.conf @@ -11,7 +11,7 @@ # Values: TEXT # #2014-12-01 00:47:54.331821 [WARNING] sofia_reg.c:2752 Can't find user [1000@xxx.xxx.xxx.xxx] from 62.210.151.162 -failregex = \[WARNING\] sofia_reg.c:2752 Can't find user \[.*@\d+.\d+.\d+.\d+\] from +failregex = \[WARNING\] sofia_reg.c:\d+ Can't find user \[.*@\d+.\d+.\d+.\d+\] from # Option: ignoreregex # Notes.: regex to ignore. If this regex matches, the line is ignored. From 370c880fd87734ae4fceb1214a63d142e229b67f Mon Sep 17 00:00:00 2001 From: Mafoo Date: Tue, 5 Jul 2016 17:58:40 +0100 Subject: [PATCH 03/57] BugFix-add missing source-master.sh (#29) --- debian/resources/switch/source-master.sh | 38 ++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100755 debian/resources/switch/source-master.sh diff --git a/debian/resources/switch/source-master.sh b/debian/resources/switch/source-master.sh new file mode 100755 index 0000000..258ebf2 --- /dev/null +++ b/debian/resources/switch/source-master.sh @@ -0,0 +1,38 @@ +#!/bin/sh +echo "Installing the FreeSWITCH source" +DEBIAN_FRONTEND=none APT_LISTCHANGES_FRONTEND=none apt-get install -y --force-yes ntpdate libapache2-mod-log-sql-ssl libfreetype6-dev git-buildpackage doxygen yasm nasm gdb git build-essential automake autoconf 'libtool-bin|libtool' python uuid-dev zlib1g-dev 'libjpeg8-dev|libjpeg62-turbo-dev' libncurses5-dev libssl-dev libpcre3-dev libcurl4-openssl-dev libldns-dev libedit-dev libspeexdsp-dev libspeexdsp-dev libsqlite3-dev perl libgdbm-dev libdb-dev bison libvlc-dev libvlccore-dev vlc-nox pkg-config ccache libpng-dev libvpx-dev libyuv-dev libopenal-dev libbroadvoice-dev libcodec2-dev libflite-dev libg7221-dev libilbc-dev libmongoc-dev libsilk-dev libsoundtouch-dev libmagickcore-dev liblua5.2-dev libopus-dev libsndfile-dev libopencv-dev libavformat-dev libx264-dev erlang-dev libldap2-dev libmemcached-dev libperl-dev portaudio19-dev python-dev libsnmp-dev libyaml-dev libmp4v2-dev +apt-get install -y --force-yes unzip libpq-dev memcached libshout3-dev libvpx-dev libmpg123-dev libmp3lame-dev + +apt-get update && apt-get install -y --force-yes curl haveged +curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - +echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list +echo "deb http://files.freeswitch.org/repo/deb/debian-unstable/ jessie main" > /etc/apt/sources.list.d/freeswitch.list +apt-get update && apt-get upgrade +apt-get install -y --force-yes freeswitch-video-deps-most + +git clone https://freeswitch.org/stash/scm/fs/freeswitch.git /usr/src/freeswitch +cd /usr/src/freeswitch + +sed -i /usr/src/freeswitch/modules.conf -e s:'#applications/mod_avmd:applications/mod_avmd:' +sed -i /usr/src/freeswitch/modules.conf -e s:'#applications/mod_callcenter:applications/mod_callcenter:' +sed -i /usr/src/freeswitch/modules.conf -e s:'#applications/mod_cidlookup:applications/mod_cidlookup:' +sed -i /usr/src/freeswitch/modules.conf -e s:'#applications/mod_memcache:applications/mod_memcache:' +sed -i /usr/src/freeswitch/modules.conf -e s:'#applications/mod_curl:applications/mod_curl:' +sed -i /usr/src/freeswitch/modules.conf -e s:'#formats/mod_shout:formats/mod_shout:' +./bootstrap.sh -j +#./configure --prefix=/usr/local/freeswitch --enable-core-pgsql-support --enable-system-lua --disable-fhs +./configure --prefix=/usr/local/freeswitch --enable-core-pgsql-support --disable-fhs + +#make mod_shout-install +make +rm -rf /usr/local/freeswitch/{lib,mod,bin}/* +make install +make sounds-install moh-install +make hd-sounds-install hd-moh-install +make cd-sounds-install cd-moh-install + +useradd freeswitch + +#configure system service +ln -s /usr/local/freeswitch/bin/fs_cli /usr/bin/fs_cli +cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service \ No newline at end of file From a0b0016a400b26114ef6420c5d0b383698b281b7 Mon Sep 17 00:00:00 2001 From: Mafoo Date: Tue, 5 Jul 2016 17:59:30 +0100 Subject: [PATCH 04/57] Enhance-Get Version automatically (#28) fetch the latest version automatically --- debian/resources/switch/source-release.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/resources/switch/source-release.sh b/debian/resources/switch/source-release.sh index 3eb521c..e4c05c6 100755 --- a/debian/resources/switch/source-release.sh +++ b/debian/resources/switch/source-release.sh @@ -11,10 +11,14 @@ apt-get install -y --force-yes freeswitch-video-deps-most #git clone https://freeswitch.org/stash/scm/fs/freeswitch.git /usr/src/freeswitch #git clone -b v1.6 https://freeswitch.org/stash/scm/fs/freeswitch.git /usr/src/freeswitch -cd /usr/src && wget http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.9.zip -unzip freeswitch-1.6.9.zip +SWITCH_MAJOR=$(git ls-remote --heads https://freeswitch.org/stash/scm/fs/freeswitch.git "v*" | cut -d/ -f 3 | grep -P '^v\d+\.\d+' | sort | tail -n 1| cut -dv -f2) +SWITCH_VERSION=$(git ls-remote --tags https://freeswitch.org/stash/scm/fs/freeswitch.git v$SWITCH_MAJOR.* | cut -d/ -f3 | sort | tail -n1 | cut -dv -f2) +echo "Using version $SWITCH_VERSION" +cd /usr/src +wget http://files.freeswitch.org/freeswitch-releases/freeswitch-$SWITCH_VERSION.zip +unzip freeswitch-$SWITCH_VERSION.zip rm -R freeswitch -cp -R freeswitch-1.6.9 freeswitch +mv freeswitch-$SWITCH_VERSION freeswitch cd freeswitch #./bootstrap.sh -j From 9a524b432951c72d5411ae77a38da5c6d3ab2f92 Mon Sep 17 00:00:00 2001 From: Mafoo Date: Tue, 5 Jul 2016 18:00:20 +0100 Subject: [PATCH 05/57] BugFix-source-release (#27) source-release was cding out of the base dir so was causing following commands to fail as they were no longer correctly relative Added store and return for the working directory --- debian/resources/switch/source-release.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/resources/switch/source-release.sh b/debian/resources/switch/source-release.sh index e4c05c6..4be0739 100755 --- a/debian/resources/switch/source-release.sh +++ b/debian/resources/switch/source-release.sh @@ -9,6 +9,8 @@ echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /e apt-get update && apt-get upgrade apt-get install -y --force-yes freeswitch-video-deps-most +#we are about to move out of the executing directory so we need to preserve it to return after we are done +CWD=$(pwd) #git clone https://freeswitch.org/stash/scm/fs/freeswitch.git /usr/src/freeswitch #git clone -b v1.6 https://freeswitch.org/stash/scm/fs/freeswitch.git /usr/src/freeswitch SWITCH_MAJOR=$(git ls-remote --heads https://freeswitch.org/stash/scm/fs/freeswitch.git "v*" | cut -d/ -f 3 | grep -P '^v\d+\.\d+' | sort | tail -n 1| cut -dv -f2) @@ -39,6 +41,9 @@ make sounds-install moh-install make hd-sounds-install hd-moh-install make cd-sounds-install cd-moh-install +#return to the executing directory +cd $CWD + useradd freeswitch #configure system service From ae2c3ee411bcc08d19bcad62ed3b94b4a88eb1f1 Mon Sep 17 00:00:00 2001 From: Mafoo Date: Tue, 2 Aug 2016 18:14:57 +0100 Subject: [PATCH 06/57] Enhance-Add php config (#30) update the post_max_size to 32M during the install --- debian/install.sh | 3 +++ debian/resources/php.sh | 14 ++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 debian/resources/php.sh diff --git a/debian/install.sh b/debian/install.sh index c22757f..53f3130 100755 --- a/debian/install.sh +++ b/debian/install.sh @@ -88,6 +88,9 @@ resources/fusionpbx.sh #NGINX web server resources/nginx.sh +#PHP +resources/php.sh + #Fail2ban resources/fail2ban.sh diff --git a/debian/resources/php.sh b/debian/resources/php.sh new file mode 100644 index 0000000..56b93ca --- /dev/null +++ b/debian/resources/php.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +#send a message +echo "Configure PHP" + +#update config if source is being used +sed 's#post_max_size = .*#post_max_size = 32M#g' -i /etc/php5/fpm/php.ini + +#restart php5-fpm +#systemd +/bin/systemctl restart php5-fpm + +#init.d +#/usr/sbin/service php5-fpm restart From 7fb40be1d844a042f7caab8f6cfe42ad7ac9b091 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 2 Aug 2016 11:31:50 -0600 Subject: [PATCH 07/57] Update php.sh Use upload_max_filesize instead of post_max_size the word upload is in the name of this parameter making it more intuitive. --- debian/resources/php.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/resources/php.sh b/debian/resources/php.sh index 56b93ca..5193def 100644 --- a/debian/resources/php.sh +++ b/debian/resources/php.sh @@ -4,7 +4,8 @@ echo "Configure PHP" #update config if source is being used -sed 's#post_max_size = .*#post_max_size = 32M#g' -i /etc/php5/fpm/php.ini +#sed 's#post_max_size = .*#post_max_size = 80M#g' -i /etc/php5/fpm/php.ini +sed 's#upload_max_filesize = .*#upload_max_filesize = 80M#g' -i /etc/php5/fpm/php.ini #restart php5-fpm #systemd From ace73b168a6a9e1b4e2a3d5afd95c5ff2f2bd031 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 3 Aug 2016 12:09:53 -0600 Subject: [PATCH 08/57] Update php.sh --- debian/resources/php.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/resources/php.sh b/debian/resources/php.sh index 5193def..d284d71 100644 --- a/debian/resources/php.sh +++ b/debian/resources/php.sh @@ -4,7 +4,7 @@ echo "Configure PHP" #update config if source is being used -#sed 's#post_max_size = .*#post_max_size = 80M#g' -i /etc/php5/fpm/php.ini +sed 's#post_max_size = .*#post_max_size = 80M#g' -i /etc/php5/fpm/php.ini sed 's#upload_max_filesize = .*#upload_max_filesize = 80M#g' -i /etc/php5/fpm/php.ini #restart php5-fpm From a5ca4871455ef1f64e8327dd37a7f7160dfa2e59 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 3 Aug 2016 14:38:42 -0600 Subject: [PATCH 09/57] Update package-permissions.sh Add -p for mkdir. --- debian/resources/switch/package-permissions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/resources/switch/package-permissions.sh b/debian/resources/switch/package-permissions.sh index 534db12..d84077c 100755 --- a/debian/resources/switch/package-permissions.sh +++ b/debian/resources/switch/package-permissions.sh @@ -7,7 +7,7 @@ chown -R freeswitch:freeswitch /var/lib/freeswitch chmod -R ug+rw /var/lib/freeswitch find /var/lib/freeswitch -type d -exec chmod 2770 {} \; -mkdir /usr/share/freeswitch/scripts +mkdir -p /usr/share/freeswitch/scripts chown -R freeswitch:freeswitch /usr/share/freeswitch chmod -R ug+rw /usr/share/freeswitch find /usr/share/freeswitch -type d -exec chmod 2770 {} \; From faa194d602a880538bbcbadcc245cb470691d629 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Wed, 3 Aug 2016 14:41:12 -0600 Subject: [PATCH 10/57] Update fusionpbx Set client_max_body_size to 80 mb. --- debian/resources/nginx/fusionpbx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/resources/nginx/fusionpbx b/debian/resources/nginx/fusionpbx index bb44bd5..c324778 100644 --- a/debian/resources/nginx/fusionpbx +++ b/debian/resources/nginx/fusionpbx @@ -5,7 +5,7 @@ server{ access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; - client_max_body_size 25M; + client_max_body_size 80M; client_body_buffer_size 128k; location / { @@ -82,7 +82,7 @@ server { access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; - client_max_body_size 25M; + client_max_body_size 80M; client_body_buffer_size 128k; location / { @@ -159,7 +159,7 @@ server { access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; - client_max_body_size 25M; + client_max_body_size 80M; client_body_buffer_size 128k; location / { From 9bb09c15d24b1cd027e2c5c2fd90e4163ef5374c Mon Sep 17 00:00:00 2001 From: Mafoo Date: Fri, 5 Aug 2016 15:10:39 +0100 Subject: [PATCH 11/57] BugFix-Arm compatibility (#31) fix an issue reported in IRC with cubox-i4 not detecting the cpu correctly --- debian/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/install.sh b/debian/install.sh index 53f3130..0b612f0 100755 --- a/debian/install.sh +++ b/debian/install.sh @@ -48,13 +48,13 @@ if [ $CPU_CHECK = true ]; then OS_bits=$(uname -m) OS_arch=$(uname -m) CPU_bits='i686' - if [ $(grep -o -w 'lm' /proc/cpuinfo) = 'lm' ]; then + if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then CPU_bits='x86_64' fi if [ $USE_SWITCH_SOURCE = false ]; then if [ $OS_arch = 'armv7l' ]; then - if [ $USE_SWITCH_PACKAGE_UNOFFICIAL_ARM = false && OS_bits = 'i686' ]; then + if [ $USE_SWITCH_PACKAGE_UNOFFICIAL_ARM = false ] && [ OS_bits = 'i686' ]; then error "You are using a 32bit arm OS this is unsupported" warning " please rerun with either --use-switch-package-unofficial-arm or --use-switch-source" exit 3 From df19549c9fe0e97d2d69c3d786b72173e4d16a59 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 11 Aug 2016 01:02:49 -0600 Subject: [PATCH 12/57] Update source-permissions.sh --- debian/resources/switch/source-permissions.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/resources/switch/source-permissions.sh b/debian/resources/switch/source-permissions.sh index 05676f6..829349e 100755 --- a/debian/resources/switch/source-permissions.sh +++ b/debian/resources/switch/source-permissions.sh @@ -1,8 +1,4 @@ -#add users to the groups -usermod -a -G freeswitch www-data -usermod -a -G www-data freeswitch - #setup owner and group, permissions and sticky -chown -R freeswitch:freeswitch /usr/local/freeswitch +chown -R www-data:www-data /usr/local/freeswitch chmod -R ug+rw /usr/local/freeswitch find /usr/local/freeswitch -type d -exec chmod 2770 {} \; From 8992712007af48d6f38e02c17201851f9d44b768 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 11 Aug 2016 01:05:11 -0600 Subject: [PATCH 13/57] Update freeswitch.service --- debian/resources/switch/source/freeswitch.service | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/resources/switch/source/freeswitch.service b/debian/resources/switch/source/freeswitch.service index ae08231..3eca386 100644 --- a/debian/resources/switch/source/freeswitch.service +++ b/debian/resources/switch/source/freeswitch.service @@ -2,8 +2,8 @@ [Unit] Description=freeswitch -After=syslog.target network.target local-fs.target postgresql.service - +After=syslog.target network.target local-fs.target postgresql.service haveged.service + [Service] ; service Type=forking @@ -51,4 +51,4 @@ UMask=0007 ; execute "systemctl daemon-reload" after editing the unit files. [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target From 5c7cfadafa9ecbb6c53f2173e4710dce6ac78ff5 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 11 Aug 2016 01:07:04 -0600 Subject: [PATCH 14/57] Create etc.default.freeswitch.source --- debian/resources/switch/source/etc.default.freeswitch.source | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 debian/resources/switch/source/etc.default.freeswitch.source diff --git a/debian/resources/switch/source/etc.default.freeswitch.source b/debian/resources/switch/source/etc.default.freeswitch.source new file mode 100644 index 0000000..456983a --- /dev/null +++ b/debian/resources/switch/source/etc.default.freeswitch.source @@ -0,0 +1,4 @@ +# /etc/default/freeswitch +FS_USER="www-data" +FS_GROUP="www-data" +DAEMON_OPTS="-nonat -ncwait -u www-data -g www-data -run /var/run/freeswitch" From bf92ef1d6dd3e264fe21ea4849c7ce0fa2a2dd2d Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Thu, 11 Aug 2016 01:11:14 -0600 Subject: [PATCH 15/57] Update source-release.sh Add /etc/default/freeswitch for source-release version --- debian/resources/switch/source-release.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/resources/switch/source-release.sh b/debian/resources/switch/source-release.sh index 4be0739..817c75e 100755 --- a/debian/resources/switch/source-release.sh +++ b/debian/resources/switch/source-release.sh @@ -48,4 +48,5 @@ useradd freeswitch #configure system service ln -s /usr/local/freeswitch/bin/fs_cli /usr/bin/fs_cli -cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service \ No newline at end of file +cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service +cp "$(dirname $0)/source/etc.default.freeswitch.source /etc/default/freeswitch From 41c48b7df21a225237e164595c52f33b9cd2e973 Mon Sep 17 00:00:00 2001 From: Mafoo Date: Mon, 15 Aug 2016 16:22:23 +0100 Subject: [PATCH 16/57] Enhance-Add Raspbian Support (#32) If lsb_release -i is Raspbian report as Debian to os_check reorganised CPU/OS checks to be more in depth and separate detects from checks --- debian/install.sh | 85 +++++++++++++++++++++++++++++++++++++---------- install.sh | 7 +++- 2 files changed, 74 insertions(+), 18 deletions(-) diff --git a/debian/install.sh b/debian/install.sh index 0b612f0..9565504 100755 --- a/debian/install.sh +++ b/debian/install.sh @@ -43,32 +43,83 @@ if [ $HELP = true ]; then exit; fi -if [ $CPU_CHECK = true ]; then - #check what the CPU is - OS_bits=$(uname -m) - OS_arch=$(uname -m) - CPU_bits='i686' +if [ $CPU_CHECK = true ] && [ $USE_SWITCH_SOURCE = false ]; then + #check what the CPU and OS are + OS_test=$(uname -m) + CPU_arch='unknown' + OS_bits='unknown' + CPU_bits='unknown' + if [ $OS_test = 'armv7l' ]; then + OS_bits='32' + CPU_bits='32' + # RaspberryPi 3 is actually armv8l but current Raspbian reports the cpu as armv7l and no Raspbian 64Bit has been released at this time + CPU_arch='arm' + elif [ $OS_test = 'armv8l' ]; then + # We currently have no test case for armv8l + OS_bits='unknown' + CPU_bits='64' + CPU_arch='arm' + elif [ $OS_test = 'i386' ]; then + OS_bits='32' if [ "$(grep -o -w 'lm' /proc/cpuinfo)" = 'lm' ]; then - CPU_bits='x86_64' + CPU_bits='64' + else + CPU_bits='32' + fi + CPU_arch='x86' + elif [ $OS_test = 'i686' ]; then + OS_bits='32' + if [ $(grep -o -w 'lm' /proc/cpuinfo) = 'lm' ]; then + CPU_bits='64' + else + CPU_bits='32' + fi + CPU_arch='x86' + elif [ $OS_test = 'x86_64' ]; then + OS_bits='64' + if [ $(grep -o -w 'lm' /proc/cpuinfo) = 'lm' ]; then + CPU_bits='64' + else + CPU_bits='32' + fi + CPU_arch='x86' fi - if [ $USE_SWITCH_SOURCE = false ]; then - if [ $OS_arch = 'armv7l' ]; then - if [ $USE_SWITCH_PACKAGE_UNOFFICIAL_ARM = false ] && [ OS_bits = 'i686' ]; then + if [ $CPU_arch = 'arm' ]; then + if [ $OS_bits = '32' ]; then + if [ $USE_SWITCH_PACKAGE_UNOFFICIAL_ARM = false ]; then error "You are using a 32bit arm OS this is unsupported" warning " please rerun with either --use-switch-package-unofficial-arm or --use-switch-source" exit 3 + else + verbose "Correct CPU/OS detected, using unofficial arm repo" fi + elif [ $OS_bits = '64' ]; then + error "You are using a 64bit arm OS this is unsupported" + warning " please rerun with --use-switch-source" + exit 3 else - if [ $OS_bits = 'i686' ]; then - error "You are using a 32bit OS this is unsupported" - if [ $CPU_bits = 'x86_64' ]; then - error "Your CPU is 64bit you should consider reinstalling with a 64bit OS" - fi - warning " please rerun with --use-switch-source" - exit 3 - fi + error "Unknown OS_bits $OS_bits this is unsupported" + warning " please rerun with --use-switch-source" + exit 3 fi + elif [ $CPU_arch = 'x86' ]; then + if [ $OS_bits = '32' ]; then + error "You are using a 32bit OS this is unsupported" + if [ $CPU_bits = '64' ]; then + warning " Your CPU is 64bit you should consider reinstalling with a 64bit OS" + fi + warning " please rerun with --use-switch-source" + exit 3 + elif [ $OS_bits = '64' ]; then + verbose "Correct CPU/OS detected" + else + error "Unknown OS_bits $OS_bits this is unsupported" + warning " please rerun with --use-switch-source" + exit 3 + fi + else + error "You are using a unsupported architecture $CPU_arch" fi fi diff --git a/install.sh b/install.sh index 51cdf81..a2c6ee9 100644 --- a/install.sh +++ b/install.sh @@ -45,6 +45,7 @@ chmod +x $0 #Os/Distro Check os_check=$(lsb_release -is) +real_os=$os_check check_major_release=$(lsb_release -rs | cut -d. -f1) os_unsupported () { @@ -54,6 +55,10 @@ os_unsupported () { exit 2; } +if [ $os_check = 'Raspbian' ]; then + echo "${yellow}Detected Raspbian, using Debian for compatibility${normal}" + os_check="Debian" +fi if [ $os_check = 'Debian' ]; then if [ $check_major_release -ge 8 ]; then verbose "Removing the CD image from /etc/apt/sources.list" @@ -73,7 +78,7 @@ if [ $os_check = 'Debian' ]; then cd /usr/src/fusionpbx-install.sh/debian ./install.sh $@ else - error "Although you are running Debian we require version >= 8" + error "Although you are running $real_os we require version >= 8" os_unsupported fi else From d9bd863e121c28f990fe11a935a8d05c7948a970 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 18:24:39 -0600 Subject: [PATCH 17/57] Rename package-permissions.sh to package-split-permissions.sh --- .../{package-permissions.sh => package-split-permissions.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename debian/resources/switch/{package-permissions.sh => package-split-permissions.sh} (100%) diff --git a/debian/resources/switch/package-permissions.sh b/debian/resources/switch/package-split-permissions.sh similarity index 100% rename from debian/resources/switch/package-permissions.sh rename to debian/resources/switch/package-split-permissions.sh From 650a884c493a5de4bf4bc51cdca3771096c77b14 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 18:25:54 -0600 Subject: [PATCH 18/57] Create package-permissions.sh --- debian/resources/switch/package-permissions.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/resources/switch/package-permissions.sh diff --git a/debian/resources/switch/package-permissions.sh b/debian/resources/switch/package-permissions.sh new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/resources/switch/package-permissions.sh @@ -0,0 +1 @@ + From 8f993892f9253a271c7b31e96dddd17cb49f8282 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 18:29:25 -0600 Subject: [PATCH 19/57] Update package-permissions.sh --- debian/resources/switch/package-permissions.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/resources/switch/package-permissions.sh b/debian/resources/switch/package-permissions.sh index 8b13789..c49b12b 100644 --- a/debian/resources/switch/package-permissions.sh +++ b/debian/resources/switch/package-permissions.sh @@ -1 +1,5 @@ - +#setup owner and group, permissions and sticky +chown -R www-data:www-data /etc/freeswitch +chown -R www-data:www-data /var/lib/freeswitch +chown -R www-data:www-data /usr/share/freeswitch +chown -R www-data:www-data /var/log/freeswitch From 55a56e607eba2945921d6f5364b2cd5c24ed0def Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 18:50:58 -0600 Subject: [PATCH 20/57] Update package-permissions.sh --- debian/resources/switch/package-permissions.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/resources/switch/package-permissions.sh b/debian/resources/switch/package-permissions.sh index c49b12b..fc25e86 100644 --- a/debian/resources/switch/package-permissions.sh +++ b/debian/resources/switch/package-permissions.sh @@ -3,3 +3,4 @@ chown -R www-data:www-data /etc/freeswitch chown -R www-data:www-data /var/lib/freeswitch chown -R www-data:www-data /usr/share/freeswitch chown -R www-data:www-data /var/log/freeswitch +chown -R www-data:www-data /var/run/freeswitch From 3f236e1b6e3f3ff660071273700d74bdcc072492 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 18:52:12 -0600 Subject: [PATCH 21/57] Update freeswitch.service --- debian/resources/switch/source/freeswitch.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/resources/switch/source/freeswitch.service b/debian/resources/switch/source/freeswitch.service index 3eca386..827e353 100644 --- a/debian/resources/switch/source/freeswitch.service +++ b/debian/resources/switch/source/freeswitch.service @@ -10,7 +10,8 @@ Type=forking PIDFile=/run/freeswitch/freeswitch.pid Environment="DAEMON_OPTS=-nonat" EnvironmentFile=-/etc/default/freeswitch -ExecStart=/usr/local/freeswitch/bin/freeswitch -u freeswitch -g freeswitch -ncwait $DAEMON_OPTS +ExecStart=/usr/local/freeswitch/bin/freeswitch -u www-data -g www-data -ncwait $DAEMON_OPTS +;ExecStart=/usr/local/freeswitch/bin/freeswitch -u freeswitch -g freeswitch -ncwait $DAEMON_OPTS TimeoutSec=45s Restart=always ; exec From d77f2aabe93f9faeabd081bc23d83cf47097039c Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 22:02:22 -0600 Subject: [PATCH 22/57] Rename debian/resources/switch/package-permissions.sh to debian/resources/switcpermissions.sh --- .../{switch/package-permissions.sh => switcpermissions.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename debian/resources/{switch/package-permissions.sh => switcpermissions.sh} (100%) diff --git a/debian/resources/switch/package-permissions.sh b/debian/resources/switcpermissions.sh similarity index 100% rename from debian/resources/switch/package-permissions.sh rename to debian/resources/switcpermissions.sh From fcd829b20a303c28c78f3aace5b7bf18395aee0e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 22:03:46 -0600 Subject: [PATCH 23/57] Update switcpermissions.sh --- debian/resources/switcpermissions.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/resources/switcpermissions.sh b/debian/resources/switcpermissions.sh index fc25e86..2ad671e 100644 --- a/debian/resources/switcpermissions.sh +++ b/debian/resources/switcpermissions.sh @@ -1,4 +1,3 @@ -#setup owner and group, permissions and sticky chown -R www-data:www-data /etc/freeswitch chown -R www-data:www-data /var/lib/freeswitch chown -R www-data:www-data /usr/share/freeswitch From c126857359b5ae033e87b4c3227956e59da481b8 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 22:04:20 -0600 Subject: [PATCH 24/57] Rename debian/resources/switcpermissions.sh to debian/resources/switch/permissions.sh --- debian/resources/{switcpermissions.sh => switch/permissions.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename debian/resources/{switcpermissions.sh => switch/permissions.sh} (100%) diff --git a/debian/resources/switcpermissions.sh b/debian/resources/switch/permissions.sh similarity index 100% rename from debian/resources/switcpermissions.sh rename to debian/resources/switch/permissions.sh From 86475e68f933d064d9e0ab5386efc23f5d3afd37 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 22:20:39 -0600 Subject: [PATCH 25/57] Rename package-split-permissions.sh to package-permissions.sh --- .../{package-split-permissions.sh => package-permissions.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename debian/resources/switch/{package-split-permissions.sh => package-permissions.sh} (100%) diff --git a/debian/resources/switch/package-split-permissions.sh b/debian/resources/switch/package-permissions.sh similarity index 100% rename from debian/resources/switch/package-split-permissions.sh rename to debian/resources/switch/package-permissions.sh From 383d9c0abbda7ac562b20fbe6859739f7f1b41c9 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 22:35:28 -0600 Subject: [PATCH 26/57] Update permissions.sh --- debian/resources/switch/permissions.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/resources/switch/permissions.sh b/debian/resources/switch/permissions.sh index 2ad671e..2959676 100644 --- a/debian/resources/switch/permissions.sh +++ b/debian/resources/switch/permissions.sh @@ -3,3 +3,6 @@ chown -R www-data:www-data /var/lib/freeswitch chown -R www-data:www-data /usr/share/freeswitch chown -R www-data:www-data /var/log/freeswitch chown -R www-data:www-data /var/run/freeswitch +cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service +cp "$(dirname $0)/source/etc.default.freeswitch.source /etc/default/freeswitch +sed -i /lib/systemd/system/freeswitch.service -e s:'-u freeswitch -g freeswitch:-u www-data -g www-data:' From 5f696755daf36dcc69a2f85701055f9eea93c898 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 22:40:08 -0600 Subject: [PATCH 27/57] Update install.sh Use the permissions.sh script by default. --- debian/install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/install.sh b/debian/install.sh index 9565504..14d7ecb 100755 --- a/debian/install.sh +++ b/debian/install.sh @@ -152,7 +152,8 @@ if [ $USE_SWITCH_SOURCE = true ]; then else resources/switch/source-release.sh fi - resources/switch/source-permissions.sh + #resources/switch/source-permissions.sh + resources/switch/permissions.sh else if [ $USE_SWITCH_MASTER = true ]; then if [ $USE_SWITCH_PACKAGE_ALL = true ]; then @@ -167,7 +168,8 @@ else resources/switch/package-release.sh fi fi - resources/switch/package-permissions.sh + #resources/switch/package-permissions.sh + resources/switch/permissions.sh fi #Postgres From dbd8f0fe58a34d34a67a2fefbfe40acc2a96c943 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 23:00:13 -0600 Subject: [PATCH 28/57] Create conf-copy.sh --- debian/resources/switch/conf-copy.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 debian/resources/switch/conf-copy.sh diff --git a/debian/resources/switch/conf-copy.sh b/debian/resources/switch/conf-copy.sh new file mode 100644 index 0000000..8d910a8 --- /dev/null +++ b/debian/resources/switch/conf-copy.sh @@ -0,0 +1,3 @@ +mv /etc/freeswitch /etc/freeswitch.orig +mkdir /etc/freeswitch +cp -R /var/www/fusionpbx/resources/templates/conf/* /etc/freeswitch From d983f7075cb295aa4de6024a6e63e7d7f63159e1 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 15 Aug 2016 23:07:30 -0600 Subject: [PATCH 29/57] Update install.sh --- debian/install.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/install.sh b/debian/install.sh index 14d7ecb..425a734 100755 --- a/debian/install.sh +++ b/debian/install.sh @@ -152,8 +152,11 @@ if [ $USE_SWITCH_SOURCE = true ]; then else resources/switch/source-release.sh fi - #resources/switch/source-permissions.sh + #resources/switch/package-permissions.sh resources/switch/permissions.sh + + #copy the switch conf files to /etc/freeswitch + resources/switch/conf-copy.sh else if [ $USE_SWITCH_MASTER = true ]; then if [ $USE_SWITCH_PACKAGE_ALL = true ]; then @@ -170,6 +173,9 @@ else fi #resources/switch/package-permissions.sh resources/switch/permissions.sh + + #copy the switch conf files to /etc/freeswitch + resources/switch/conf-copy.sh fi #Postgres From 4b5a120993da90c6087a374b0cba6e66f849a08c Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 08:04:28 -0600 Subject: [PATCH 30/57] Update permissions.sh --- debian/resources/switch/permissions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/resources/switch/permissions.sh b/debian/resources/switch/permissions.sh index 2959676..4bf01c9 100644 --- a/debian/resources/switch/permissions.sh +++ b/debian/resources/switch/permissions.sh @@ -4,5 +4,5 @@ chown -R www-data:www-data /usr/share/freeswitch chown -R www-data:www-data /var/log/freeswitch chown -R www-data:www-data /var/run/freeswitch cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service -cp "$(dirname $0)/source/etc.default.freeswitch.source /etc/default/freeswitch +cp "$(dirname $0)/source/etc.default.freeswitch.source" /etc/default/freeswitch sed -i /lib/systemd/system/freeswitch.service -e s:'-u freeswitch -g freeswitch:-u www-data -g www-data:' From 5153b3a4f0c7e32f745cc3ac1a3e668e19a5efc3 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 08:32:39 -0600 Subject: [PATCH 31/57] Update package-release.sh Remove freeswitch-systemd package so we can control the service configuration file and control the user it uses. --- debian/resources/switch/package-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/resources/switch/package-release.sh b/debian/resources/switch/package-release.sh index 5242099..4f73f74 100755 --- a/debian/resources/switch/package-release.sh +++ b/debian/resources/switch/package-release.sh @@ -13,7 +13,7 @@ else fi apt-get update apt-get install -y --force-yes gdb -apt-get install -y --force-yes freeswitch-meta-bare freeswitch-conf-vanilla freeswitch-systemd freeswitch-mod-commands freeswitch-meta-codecs freeswitch-mod-console freeswitch-mod-logfile freeswitch-mod-distributor +apt-get install -y --force-yes freeswitch-meta-bare freeswitch-conf-vanilla freeswitch-mod-commands freeswitch-meta-codecs freeswitch-mod-console freeswitch-mod-logfile freeswitch-mod-distributor apt-get install -y --force-yes freeswitch-lang-en freeswitch-mod-say-en freeswitch-sounds-en-us-callie freeswitch-music-default apt-get install -y --force-yes freeswitch-mod-enum freeswitch-mod-cdr-csv freeswitch-mod-event-socket freeswitch-mod-sofia freeswitch-mod-sofia-dbg freeswitch-mod-loopback apt-get install -y --force-yes freeswitch-mod-conference freeswitch-mod-db freeswitch-mod-dptools freeswitch-mod-expr freeswitch-mod-fifo libyuv-dev freeswitch-mod-httapi From 5dc968dc5a5ac0c819dc76e762872214d596a464 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 08:38:43 -0600 Subject: [PATCH 32/57] Update package-master.sh --- debian/resources/switch/package-master.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/resources/switch/package-master.sh b/debian/resources/switch/package-master.sh index f3f3c44..774937b 100755 --- a/debian/resources/switch/package-master.sh +++ b/debian/resources/switch/package-master.sh @@ -5,7 +5,7 @@ echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /e echo "deb http://files.freeswitch.org/repo/deb/debian-unstable/ jessie main" >> /etc/apt/sources.list.d/freeswitch.list apt-get update apt-get install -y --force-yes gdb -apt-get install -y --force-yes freeswitch-meta-bare freeswitch-conf-vanilla freeswitch-systemd freeswitch-mod-commands freeswitch-meta-codecs freeswitch-mod-console freeswitch-mod-logfile freeswitch-mod-distributor +apt-get install -y --force-yes freeswitch-meta-bare freeswitch-conf-vanilla freeswitch-mod-commands freeswitch-meta-codecs freeswitch-mod-console freeswitch-mod-logfile freeswitch-mod-distributor apt-get install -y --force-yes freeswitch-lang-en freeswitch-mod-say-en freeswitch-sounds-en-us-callie freeswitch-music-default apt-get install -y --force-yes freeswitch-mod-enum freeswitch-mod-cdr-csv freeswitch-mod-event-socket freeswitch-mod-sofia freeswitch-mod-sofia-dbg freeswitch-mod-loopback apt-get install -y --force-yes freeswitch-mod-conference freeswitch-mod-db freeswitch-mod-dptools freeswitch-mod-expr freeswitch-mod-fifo libyuv-dev freeswitch-mod-httapi @@ -14,6 +14,6 @@ apt-get install -y --force-yes freeswitch-mod-sndfile freeswitch-mod-native-file apt-get install -y --force-yes freeswitch-mod-xml-cdr freeswitch-mod-verto freeswitch-mod-callcenter freeswitch-mod-rtc freeswitch-mod-png freeswitch-mod-json-cdr freeswitch-mod-shout apt-get install -y --force-yes freeswitch-mod-skypopen freeswitch-mod-skypopen-dbg freeswitch-mod-sms freeswitch-mod-sms-dbg freeswitch-mod-cidlookup freeswitch-mod-memcache apt-get install -y --force-yes freeswitch-mod-imagick freeswitch-mod-tts-commandline freeswitch-mod-directory freeswitch-mod-flite - -#make sure that postgresql is started before starting freeswitch -sed -i /lib/systemd/system/freeswitch.service -e s:'local-fs.target:local-fs.target postgresql.service:' + +#make sure that postgresql is started before starting freeswitch +sed -i /lib/systemd/system/freeswitch.service -e s:'local-fs.target:local-fs.target postgresql.service:' From 693ee214a38d52de7f254674037e209fb9d7c37f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 09:36:50 -0600 Subject: [PATCH 33/57] Update permissions.sh --- debian/resources/switch/permissions.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/resources/switch/permissions.sh b/debian/resources/switch/permissions.sh index 4bf01c9..1b6b4f9 100644 --- a/debian/resources/switch/permissions.sh +++ b/debian/resources/switch/permissions.sh @@ -6,3 +6,6 @@ chown -R www-data:www-data /var/run/freeswitch cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service cp "$(dirname $0)/source/etc.default.freeswitch.source" /etc/default/freeswitch sed -i /lib/systemd/system/freeswitch.service -e s:'-u freeswitch -g freeswitch:-u www-data -g www-data:' +systemctl enable freeswitch +systemctl unmask freeswitch.service +systemctl daemon-reload From 13dd547c04b7ea747328e578eb1959ef01b1773a Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 11:33:10 -0600 Subject: [PATCH 34/57] Create package-systemd.sh --- debian/resources/switch/package-systemd.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/resources/switch/package-systemd.sh diff --git a/debian/resources/switch/package-systemd.sh b/debian/resources/switch/package-systemd.sh new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/resources/switch/package-systemd.sh @@ -0,0 +1 @@ + From becce08b232673911af6c81bfe4e7083c1f81e90 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 11:33:59 -0600 Subject: [PATCH 35/57] Create source_systemd.sh --- debian/resources/switch/source_systemd.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/resources/switch/source_systemd.sh diff --git a/debian/resources/switch/source_systemd.sh b/debian/resources/switch/source_systemd.sh new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/debian/resources/switch/source_systemd.sh @@ -0,0 +1 @@ + From 08faf384a370e274c5268deb363bb7e2ec155112 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 11:38:17 -0600 Subject: [PATCH 36/57] Update package-systemd.sh --- debian/resources/switch/package-systemd.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/resources/switch/package-systemd.sh b/debian/resources/switch/package-systemd.sh index 8b13789..9039af0 100644 --- a/debian/resources/switch/package-systemd.sh +++ b/debian/resources/switch/package-systemd.sh @@ -1 +1,6 @@ - +cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service +cp "$(dirname $0)/source/etc.default.freeswitch.package" /etc/default/freeswitch +sed -i /lib/systemd/system/freeswitch.service -e s:'-u freeswitch -g freeswitch:-u www-data -g www-data:' +systemctl enable freeswitch +systemctl unmask freeswitch.service +systemctl daemon-reload From 293f5ae63c6c2d375aa580e2abd896393e0e866a Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 11:39:48 -0600 Subject: [PATCH 37/57] Update and rename source_systemd.sh to source-systemd.sh --- debian/resources/switch/source-systemd.sh | 6 ++++++ debian/resources/switch/source_systemd.sh | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 debian/resources/switch/source-systemd.sh delete mode 100644 debian/resources/switch/source_systemd.sh diff --git a/debian/resources/switch/source-systemd.sh b/debian/resources/switch/source-systemd.sh new file mode 100644 index 0000000..5feb6f6 --- /dev/null +++ b/debian/resources/switch/source-systemd.sh @@ -0,0 +1,6 @@ +cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service +cp "$(dirname $0)/source/etc.default.freeswitch.source" /etc/default/freeswitch +sed -i /lib/systemd/system/freeswitch.service -e s:'-u freeswitch -g freeswitch:-u www-data -g www-data:' +systemctl enable freeswitch +systemctl unmask freeswitch.service +systemctl daemon-reload diff --git a/debian/resources/switch/source_systemd.sh b/debian/resources/switch/source_systemd.sh deleted file mode 100644 index 8b13789..0000000 --- a/debian/resources/switch/source_systemd.sh +++ /dev/null @@ -1 +0,0 @@ - From daeae2e8f07e7be08de363803493d9bda11004bc Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 11:41:58 -0600 Subject: [PATCH 38/57] Update permissions.sh --- debian/resources/switch/permissions.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/debian/resources/switch/permissions.sh b/debian/resources/switch/permissions.sh index 1b6b4f9..2ad671e 100644 --- a/debian/resources/switch/permissions.sh +++ b/debian/resources/switch/permissions.sh @@ -3,9 +3,3 @@ chown -R www-data:www-data /var/lib/freeswitch chown -R www-data:www-data /usr/share/freeswitch chown -R www-data:www-data /var/log/freeswitch chown -R www-data:www-data /var/run/freeswitch -cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service -cp "$(dirname $0)/source/etc.default.freeswitch.source" /etc/default/freeswitch -sed -i /lib/systemd/system/freeswitch.service -e s:'-u freeswitch -g freeswitch:-u www-data -g www-data:' -systemctl enable freeswitch -systemctl unmask freeswitch.service -systemctl daemon-reload From e36977e2e9c9cc44eaaeac7e24242be49bdc6ccf Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 11:44:12 -0600 Subject: [PATCH 39/57] Update package-permissions.sh --- .../resources/switch/package-permissions.sh | 27 +++++-------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/debian/resources/switch/package-permissions.sh b/debian/resources/switch/package-permissions.sh index d84077c..e3cb17c 100755 --- a/debian/resources/switch/package-permissions.sh +++ b/debian/resources/switch/package-permissions.sh @@ -1,21 +1,6 @@ -#add users to the groups -usermod -a -G freeswitch www-data -usermod -a -G www-data freeswitch - -#setup owner and group, permissions and sticky -chown -R freeswitch:freeswitch /var/lib/freeswitch -chmod -R ug+rw /var/lib/freeswitch -find /var/lib/freeswitch -type d -exec chmod 2770 {} \; - -mkdir -p /usr/share/freeswitch/scripts -chown -R freeswitch:freeswitch /usr/share/freeswitch -chmod -R ug+rw /usr/share/freeswitch -find /usr/share/freeswitch -type d -exec chmod 2770 {} \; - -chown -R freeswitch:freeswitch /etc/freeswitch -chmod -R ug+rw /etc/freeswitch -find /etc/freeswitch -type d -exec chmod 2770 {} \; - -chown -R freeswitch:freeswitch /var/log/freeswitch -chmod -R ug+rw /var/log/freeswitch -find /var/log/freeswitch -type d -exec chmod 2770 {} \; +#default permissions +chown -R www-data:www-data /etc/freeswitch +chown -R www-data:www-data /var/lib/freeswitch +chown -R www-data:www-data /usr/share/freeswitch +chown -R www-data:www-data /var/log/freeswitch +chown -R www-data:www-data /var/run/freeswitch From 3236ee4e0a848fecd43964e2e44936ba71e7efd6 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 11:47:08 -0600 Subject: [PATCH 40/57] Update install.sh --- debian/install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/install.sh b/debian/install.sh index 425a734..0bd6158 100755 --- a/debian/install.sh +++ b/debian/install.sh @@ -152,8 +152,8 @@ if [ $USE_SWITCH_SOURCE = true ]; then else resources/switch/source-release.sh fi - #resources/switch/package-permissions.sh - resources/switch/permissions.sh + #set the file permissions + resources/switch/source-permissions.sh #copy the switch conf files to /etc/freeswitch resources/switch/conf-copy.sh @@ -171,8 +171,8 @@ else resources/switch/package-release.sh fi fi - #resources/switch/package-permissions.sh - resources/switch/permissions.sh + #set the file permissions + resources/switch/package-permissions.sh #copy the switch conf files to /etc/freeswitch resources/switch/conf-copy.sh From f60e570a982212d65ab28a9f615573daadb79aff Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 11:55:14 -0600 Subject: [PATCH 41/57] Update install.sh --- debian/install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/install.sh b/debian/install.sh index 0bd6158..b10d4cc 100755 --- a/debian/install.sh +++ b/debian/install.sh @@ -155,6 +155,9 @@ if [ $USE_SWITCH_SOURCE = true ]; then #set the file permissions resources/switch/source-permissions.sh + #systemd service + resources/switch/source-systemd.sh + #copy the switch conf files to /etc/freeswitch resources/switch/conf-copy.sh else @@ -174,6 +177,9 @@ else #set the file permissions resources/switch/package-permissions.sh + #systemd service + resources/switch/package-systemd.sh + #copy the switch conf files to /etc/freeswitch resources/switch/conf-copy.sh fi From 19daa2f94fcca67b62859e93d44df8eeb35b81a3 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 11:58:24 -0600 Subject: [PATCH 42/57] Delete permissions.sh --- debian/resources/switch/permissions.sh | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 debian/resources/switch/permissions.sh diff --git a/debian/resources/switch/permissions.sh b/debian/resources/switch/permissions.sh deleted file mode 100644 index 2ad671e..0000000 --- a/debian/resources/switch/permissions.sh +++ /dev/null @@ -1,5 +0,0 @@ -chown -R www-data:www-data /etc/freeswitch -chown -R www-data:www-data /var/lib/freeswitch -chown -R www-data:www-data /usr/share/freeswitch -chown -R www-data:www-data /var/log/freeswitch -chown -R www-data:www-data /var/run/freeswitch From afe579c9dd6cb8cbcdbf03cabc30b0b07951799a Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 12:01:27 -0600 Subject: [PATCH 43/57] Rename freeswitch.service to freeswitch.service.source --- .../source/{freeswitch.service => freeswitch.service.source} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename debian/resources/switch/source/{freeswitch.service => freeswitch.service.source} (100%) diff --git a/debian/resources/switch/source/freeswitch.service b/debian/resources/switch/source/freeswitch.service.source similarity index 100% rename from debian/resources/switch/source/freeswitch.service rename to debian/resources/switch/source/freeswitch.service.source From 2844cc5711af3bd090736cda54c392d3a7178832 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 12:07:32 -0600 Subject: [PATCH 44/57] Create freeswitch.service.package --- .../switch/source/freeswitch.service.package | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 debian/resources/switch/source/freeswitch.service.package diff --git a/debian/resources/switch/source/freeswitch.service.package b/debian/resources/switch/source/freeswitch.service.package new file mode 100644 index 0000000..38c600a --- /dev/null +++ b/debian/resources/switch/source/freeswitch.service.package @@ -0,0 +1,54 @@ +;;;;; Author: Travis Cross + +[Unit] +Description=freeswitch +After=syslog.target network.target local-fs.target postgresql.service + +[Service] +; service +Type=forking +PIDFile=/run/freeswitch/freeswitch.pid +Environment="DAEMON_OPTS=-nonat" +EnvironmentFile=-/etc/default/freeswitch +ExecStart=/usr/bin/freeswitch -u www-data -g www-data -ncwait $DAEMON_OPTS +TimeoutSec=45s +Restart=always +; exec +User=root +Group=daemon +LimitCORE=infinity +LimitNOFILE=100000 +LimitNPROC=60000 +LimitSTACK=250000 +LimitRTPRIO=infinity +LimitRTTIME=7000000 +IOSchedulingClass=realtime +IOSchedulingPriority=2 +CPUSchedulingPolicy=rr +CPUSchedulingPriority=89 +UMask=0007 + +; alternatives which you can enforce by placing a unit drop-in into +; /etc/systemd/system/freeswitch.service.d/*.conf: +; +; User=freeswitch +; Group=freeswitch +; ExecStart= +; ExecStart=/usr/bin/freeswitch -ncwait -nonat -rp +; +; empty ExecStart is required to flush the list. +; +; if your filesystem supports extended attributes, execute +; setcap 'cap_net_bind_service,cap_sys_nice=+ep' /usr/bin/freeswitch +; this will also allow socket binding on low ports +; +; otherwise, remove the -rp option from ExecStart and +; add these lines to give real-time priority to the process: +; +; PermissionsStartOnly=true +; ExecStartPost=/bin/chrt -f -p 1 $MAINPID +; +; execute "systemctl daemon-reload" after editing the unit files. + +[Install] +WantedBy=multi-user.target From 3dd6b008eefd23d1b33cd08beec61f72589eba9d Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 12:09:38 -0600 Subject: [PATCH 45/57] Rename etc.default.freeswitch.source to etc.default.freeswitch --- .../{etc.default.freeswitch.source => etc.default.freeswitch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename debian/resources/switch/source/{etc.default.freeswitch.source => etc.default.freeswitch} (100%) diff --git a/debian/resources/switch/source/etc.default.freeswitch.source b/debian/resources/switch/source/etc.default.freeswitch similarity index 100% rename from debian/resources/switch/source/etc.default.freeswitch.source rename to debian/resources/switch/source/etc.default.freeswitch From 90651cb0ce723e246400f3043244b66b2a3b3e62 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 12:12:44 -0600 Subject: [PATCH 46/57] Update package-systemd.sh --- debian/resources/switch/package-systemd.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/resources/switch/package-systemd.sh b/debian/resources/switch/package-systemd.sh index 9039af0..d3db588 100644 --- a/debian/resources/switch/package-systemd.sh +++ b/debian/resources/switch/package-systemd.sh @@ -1,6 +1,5 @@ -cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service -cp "$(dirname $0)/source/etc.default.freeswitch.package" /etc/default/freeswitch -sed -i /lib/systemd/system/freeswitch.service -e s:'-u freeswitch -g freeswitch:-u www-data -g www-data:' +cp "$(dirname $0)/source/freeswitch.service.package" /lib/systemd/system/freeswitch.service +cp "$(dirname $0)/source/etc.default.freeswitch" /etc/default/freeswitch systemctl enable freeswitch systemctl unmask freeswitch.service systemctl daemon-reload From f955a9dabc2349d7f61777c0216deca0c3e8515f Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 12:14:03 -0600 Subject: [PATCH 47/57] Update source-systemd.sh --- debian/resources/switch/source-systemd.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/resources/switch/source-systemd.sh b/debian/resources/switch/source-systemd.sh index 5feb6f6..dc34e3d 100644 --- a/debian/resources/switch/source-systemd.sh +++ b/debian/resources/switch/source-systemd.sh @@ -1,6 +1,5 @@ -cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service -cp "$(dirname $0)/source/etc.default.freeswitch.source" /etc/default/freeswitch -sed -i /lib/systemd/system/freeswitch.service -e s:'-u freeswitch -g freeswitch:-u www-data -g www-data:' +cp "$(dirname $0)/source/freeswitch.service.source" /lib/systemd/system/freeswitch.service +cp "$(dirname $0)/source/etc.default.freeswitch" /etc/default/freeswitch systemctl enable freeswitch systemctl unmask freeswitch.service systemctl daemon-reload From 248381abc9f480bc6ac4a5083164d5fe9f5a3c57 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 13:39:50 -0600 Subject: [PATCH 48/57] Update package-release.sh Add an ntp client --- debian/resources/switch/package-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/resources/switch/package-release.sh b/debian/resources/switch/package-release.sh index 4f73f74..e98f2e6 100755 --- a/debian/resources/switch/package-release.sh +++ b/debian/resources/switch/package-release.sh @@ -12,7 +12,7 @@ else curl http://files.freeswitch.org/repo/deb/freeswitch-1.6/key.gpg | apt-key add - fi apt-get update -apt-get install -y --force-yes gdb +apt-get install -y --force-yes gdb ntp apt-get install -y --force-yes freeswitch-meta-bare freeswitch-conf-vanilla freeswitch-mod-commands freeswitch-meta-codecs freeswitch-mod-console freeswitch-mod-logfile freeswitch-mod-distributor apt-get install -y --force-yes freeswitch-lang-en freeswitch-mod-say-en freeswitch-sounds-en-us-callie freeswitch-music-default apt-get install -y --force-yes freeswitch-mod-enum freeswitch-mod-cdr-csv freeswitch-mod-event-socket freeswitch-mod-sofia freeswitch-mod-sofia-dbg freeswitch-mod-loopback From 49df0ea4585680caa53ede37c16762dcc5e5bf33 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 13:41:10 -0600 Subject: [PATCH 49/57] Update source-release.sh --- debian/resources/switch/source-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/resources/switch/source-release.sh b/debian/resources/switch/source-release.sh index 817c75e..65da808 100755 --- a/debian/resources/switch/source-release.sh +++ b/debian/resources/switch/source-release.sh @@ -1,7 +1,7 @@ #!/bin/sh echo "Installing the FreeSWITCH source" DEBIAN_FRONTEND=none APT_LISTCHANGES_FRONTEND=none apt-get install -y --force-yes ntpdate libapache2-mod-log-sql-ssl libfreetype6-dev git-buildpackage doxygen yasm nasm gdb git build-essential automake autoconf 'libtool-bin|libtool' python uuid-dev zlib1g-dev 'libjpeg8-dev|libjpeg62-turbo-dev' libncurses5-dev libssl-dev libpcre3-dev libcurl4-openssl-dev libldns-dev libedit-dev libspeexdsp-dev libspeexdsp-dev libsqlite3-dev perl libgdbm-dev libdb-dev bison libvlc-dev libvlccore-dev vlc-nox pkg-config ccache libpng-dev libvpx-dev libyuv-dev libopenal-dev libbroadvoice-dev libcodec2-dev libflite-dev libg7221-dev libilbc-dev libmongoc-dev libsilk-dev libsoundtouch-dev libmagickcore-dev liblua5.2-dev libopus-dev libsndfile-dev libopencv-dev libavformat-dev libx264-dev erlang-dev libldap2-dev libmemcached-dev libperl-dev portaudio19-dev python-dev libsnmp-dev libyaml-dev libmp4v2-dev -apt-get install -y --force-yes unzip libpq-dev memcached libshout3-dev libvpx-dev libmpg123-dev libmp3lame-dev +apt-get install -y --force-yes ntp unzip libpq-dev memcached libshout3-dev libvpx-dev libmpg123-dev libmp3lame-dev apt-get update && apt-get install -y --force-yes curl haveged curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - From 6de3dd39dae7324dc9c506871b5fc47fb99bea62 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 13:41:49 -0600 Subject: [PATCH 50/57] Update source-master.sh --- debian/resources/switch/source-master.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/resources/switch/source-master.sh b/debian/resources/switch/source-master.sh index 258ebf2..69bf69d 100755 --- a/debian/resources/switch/source-master.sh +++ b/debian/resources/switch/source-master.sh @@ -3,7 +3,7 @@ echo "Installing the FreeSWITCH source" DEBIAN_FRONTEND=none APT_LISTCHANGES_FRONTEND=none apt-get install -y --force-yes ntpdate libapache2-mod-log-sql-ssl libfreetype6-dev git-buildpackage doxygen yasm nasm gdb git build-essential automake autoconf 'libtool-bin|libtool' python uuid-dev zlib1g-dev 'libjpeg8-dev|libjpeg62-turbo-dev' libncurses5-dev libssl-dev libpcre3-dev libcurl4-openssl-dev libldns-dev libedit-dev libspeexdsp-dev libspeexdsp-dev libsqlite3-dev perl libgdbm-dev libdb-dev bison libvlc-dev libvlccore-dev vlc-nox pkg-config ccache libpng-dev libvpx-dev libyuv-dev libopenal-dev libbroadvoice-dev libcodec2-dev libflite-dev libg7221-dev libilbc-dev libmongoc-dev libsilk-dev libsoundtouch-dev libmagickcore-dev liblua5.2-dev libopus-dev libsndfile-dev libopencv-dev libavformat-dev libx264-dev erlang-dev libldap2-dev libmemcached-dev libperl-dev portaudio19-dev python-dev libsnmp-dev libyaml-dev libmp4v2-dev apt-get install -y --force-yes unzip libpq-dev memcached libshout3-dev libvpx-dev libmpg123-dev libmp3lame-dev -apt-get update && apt-get install -y --force-yes curl haveged +apt-get update && apt-get install -y --force-yes ntp curl haveged curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list echo "deb http://files.freeswitch.org/repo/deb/debian-unstable/ jessie main" > /etc/apt/sources.list.d/freeswitch.list @@ -35,4 +35,4 @@ useradd freeswitch #configure system service ln -s /usr/local/freeswitch/bin/fs_cli /usr/bin/fs_cli -cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service \ No newline at end of file +cp "$(dirname $0)/source/freeswitch.service" /lib/systemd/system/freeswitch.service From bc9eb8e3cfd3838566b7b1be97e244a6756b7a14 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 13:42:19 -0600 Subject: [PATCH 51/57] Update package-master.sh --- debian/resources/switch/package-master.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/resources/switch/package-master.sh b/debian/resources/switch/package-master.sh index 774937b..20b3ea7 100755 --- a/debian/resources/switch/package-master.sh +++ b/debian/resources/switch/package-master.sh @@ -4,7 +4,7 @@ curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | ap echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list echo "deb http://files.freeswitch.org/repo/deb/debian-unstable/ jessie main" >> /etc/apt/sources.list.d/freeswitch.list apt-get update -apt-get install -y --force-yes gdb +apt-get install -y --force-yes ntp gdb apt-get install -y --force-yes freeswitch-meta-bare freeswitch-conf-vanilla freeswitch-mod-commands freeswitch-meta-codecs freeswitch-mod-console freeswitch-mod-logfile freeswitch-mod-distributor apt-get install -y --force-yes freeswitch-lang-en freeswitch-mod-say-en freeswitch-sounds-en-us-callie freeswitch-music-default apt-get install -y --force-yes freeswitch-mod-enum freeswitch-mod-cdr-csv freeswitch-mod-event-socket freeswitch-mod-sofia freeswitch-mod-sofia-dbg freeswitch-mod-loopback From 66bebd98fec429916d0e34de03eaf6355c0f6dc6 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 13:42:50 -0600 Subject: [PATCH 52/57] Update package-master-all.sh --- debian/resources/switch/package-master-all.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/resources/switch/package-master-all.sh b/debian/resources/switch/package-master-all.sh index 49e2a7f..5bd4cd8 100755 --- a/debian/resources/switch/package-master-all.sh +++ b/debian/resources/switch/package-master-all.sh @@ -1,9 +1,9 @@ #!/bin/sh -apt-get update && apt-get install -y --force-yes curl memcached haveged +apt-get update && apt-get install -y --force-yes ntp curl memcached haveged curl https://files.freeswitch.org/repo/deb/debian/freeswitch_archive_g0.pub | apt-key add - echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list echo "deb http://files.freeswitch.org/repo/deb/debian-unstable/ jessie main" >> /etc/apt/sources.list.d/freeswitch.list apt-get update && apt-get install -y --force-yes freeswitch-meta-all freeswitch-all-dbg gdb - -#make sure that postgresql is started before starting freeswitch -sed -i /lib/systemd/system/freeswitch.service -e s:'local-fs.target:local-fs.target postgresql.service:' + +#make sure that postgresql is started before starting freeswitch +sed -i /lib/systemd/system/freeswitch.service -e s:'local-fs.target:local-fs.target postgresql.service:' From ea76ad8b2adba32f4c8f14732e3f2bc6a2bae28e Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 13:43:23 -0600 Subject: [PATCH 53/57] Update package-all.sh --- debian/resources/switch/package-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/resources/switch/package-all.sh b/debian/resources/switch/package-all.sh index 1c0f660..a21042b 100755 --- a/debian/resources/switch/package-all.sh +++ b/debian/resources/switch/package-all.sh @@ -3,7 +3,7 @@ #initialize variable encase we are called directly [ -z $USE_SWITCH_PACKAGE_UNOFFICIAL_ARM ] && USE_SWITCH_PACKAGE_UNOFFICIAL_ARM=false -apt-get update && apt-get install -y --force-yes curl memcached haveged +apt-get update && apt-get install -y --force-yes ntp curl memcached haveged arch=$(uname -m) if [ $arch = 'armv7l' ] && [ $USE_SWITCH_PACKAGE_UNOFFICIAL_ARM = true ]; then echo "deb http://repo.sip247.com/debian/freeswitch-stable-armhf/ jessie main" > /etc/apt/sources.list.d/freeswitch.list From 10695baa986568a15fc947ef73550720288d347d Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 14:15:18 -0600 Subject: [PATCH 54/57] Update install.sh Copy freeswitch conf xml files then update the file permissions. --- debian/install.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/install.sh b/debian/install.sh index b10d4cc..be22334 100755 --- a/debian/install.sh +++ b/debian/install.sh @@ -152,14 +152,16 @@ if [ $USE_SWITCH_SOURCE = true ]; then else resources/switch/source-release.sh fi + + #copy the switch conf files to /etc/freeswitch + resources/switch/conf-copy.sh + #set the file permissions resources/switch/source-permissions.sh #systemd service resources/switch/source-systemd.sh - #copy the switch conf files to /etc/freeswitch - resources/switch/conf-copy.sh else if [ $USE_SWITCH_MASTER = true ]; then if [ $USE_SWITCH_PACKAGE_ALL = true ]; then @@ -174,14 +176,16 @@ else resources/switch/package-release.sh fi fi + + #copy the switch conf files to /etc/freeswitch + resources/switch/conf-copy.sh + #set the file permissions resources/switch/package-permissions.sh #systemd service resources/switch/package-systemd.sh - #copy the switch conf files to /etc/freeswitch - resources/switch/conf-copy.sh fi #Postgres From 7c3c2dbebef7e08371fc370fe3cc0775429e836d Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 15:56:04 -0600 Subject: [PATCH 55/57] Update package-systemd.sh --- debian/resources/switch/package-systemd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/resources/switch/package-systemd.sh b/debian/resources/switch/package-systemd.sh index d3db588..9e68815 100644 --- a/debian/resources/switch/package-systemd.sh +++ b/debian/resources/switch/package-systemd.sh @@ -1,3 +1,4 @@ +apt-get remove -y --force-yes freeswitch-systemd cp "$(dirname $0)/source/freeswitch.service.package" /lib/systemd/system/freeswitch.service cp "$(dirname $0)/source/etc.default.freeswitch" /etc/default/freeswitch systemctl enable freeswitch From 8fb7760206a0a85a2119d01bbf03ab279eaff897 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 16:53:16 -0600 Subject: [PATCH 56/57] Update freeswitch.service.package Add ExecStartPre to run mkdir and chown for /var/run/freeswitch --- debian/resources/switch/source/freeswitch.service.package | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/resources/switch/source/freeswitch.service.package b/debian/resources/switch/source/freeswitch.service.package index 38c600a..148cf85 100644 --- a/debian/resources/switch/source/freeswitch.service.package +++ b/debian/resources/switch/source/freeswitch.service.package @@ -10,6 +10,8 @@ Type=forking PIDFile=/run/freeswitch/freeswitch.pid Environment="DAEMON_OPTS=-nonat" EnvironmentFile=-/etc/default/freeswitch +ExecStartPre=/bin/mkdir -p /var/run/freeswitch/ +ExecStartPre=/bin/chown -R www-data:www-data /var/run/freeswitch/ ExecStart=/usr/bin/freeswitch -u www-data -g www-data -ncwait $DAEMON_OPTS TimeoutSec=45s Restart=always From f1626084c63c6861ae801cb90cc1a3cff437a3a9 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 16 Aug 2016 17:52:27 -0600 Subject: [PATCH 57/57] Update package-systemd.sh --- debian/resources/switch/package-systemd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/resources/switch/package-systemd.sh b/debian/resources/switch/package-systemd.sh index 9e68815..5213f5b 100644 --- a/debian/resources/switch/package-systemd.sh +++ b/debian/resources/switch/package-systemd.sh @@ -4,3 +4,4 @@ cp "$(dirname $0)/source/etc.default.freeswitch" /etc/default/freeswitch systemctl enable freeswitch systemctl unmask freeswitch.service systemctl daemon-reload +systemctl start freeswitch