Merge remote-tracking branch 'refs/remotes/fusionpbx/master' into debian-pkgs

debian/install.sh

@@ -29,6 +29,8 @@ server_address=$(hostname -I)
 
 #restart services
 /bin/systemctl daemon-reload
+/bin/systemctl try-restart freeswitch
+/bin/systemctl daemon-reload
 /bin/systemctl restart nginx
 /bin/systemctl restart fail2ban
 #/usr/sbin/service nginx restart

debian/resources/fusionpbx.sh

@@ -4,7 +4,7 @@
 echo "Install FusionPBX"
 
 #install dependencies
-apt-get install -y --force-yes vim git dbus haveged
+apt-get install -y --force-yes vim git dbus haveged ssl-cert
 apt-get install -y --force-yes ghostscript libtiff5-dev libtiff-tools
 
 #get the source code

debian/resources/switch/package-all.sh

@@ -0,0 +1,39 @@
+#!/bin/sh
+apt-get update && apt-get install -y --force-yes curl memcached haveged
+USE_UNOFFICIAL_ARM_REPO=0
+arch=$(uname -m)
+if [ $arch = 'armv7l' ] && [ $USE_UNOFFICIAL_ARM_REPO -eq 1 ]; then
+        echo "deb http://repo.sip247.com/debian/freeswitch-stable-armhf/ jessie main" > /etc/apt/sources.list.d/freeswitch.list
+        curl http://repo.sip247.com/debian/sip247.com.gpg.key | apt-key add -
+else
+        echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list
+        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 freeswitch-all freeswitch-all-dbg gdb
+#apt-get remove freeswitch-all freeswitch-all-dbg
+#rm /etc/apt/sources.list.d/freeswitch.list
+
+#set the file permissions
+chown -R freeswitch:freeswitch /var/lib/freeswitch
+chmod -R g+s /var/lib/freeswitch
+setfacl -R -m u:www-data:rwx,g:www-data:rwx /var/lib/freeswitch
+setfacl -R -d -m u:www-data:rwx,g:www-data:rwx /var/lib/freeswitch
+
+chown -R freeswitch:freeswitch /usr/share/freeswitch
+chmod -R g+s /usr/share/freeswitch
+setfacl -R -m u:www-data:rwx,g:www-data:rwx /usr/share/freeswitch
+setfacl -R -d -m u:www-data:rwx,g:www-data:rwx /usr/share/freeswitch
+
+chown -R freeswitch:freeswitch /etc/freeswitch
+chmod -R g+s /etc/freeswitch
+setfacl -R -m u:www-data:rwx,g:www-data:rwx /etc/freeswitch
+setfacl -R -d -m u:www-data:rwx,g:www-data:rwx /etc/freeswitch
+
+chown -R freeswitch:freeswitch /var/log/freeswitch
+setfacl -R -m u:www-data:rwx,g:www-data:rwx /var/log/freeswitch
+setfacl -R -d -m u:www-data:rwx,g:www-data:rwx /var/log/freeswitch
+
+chown -R freeswitch:freeswitch /usr/share/freeswitch/sounds
+chmod -R g+s /usr/share/freeswitch/sounds
+setfacl -R -m u:www-data:rwx,g:www-data:rwx /usr/share/freeswitch/sounds
+setfacl -R -d -m u:www-data:rwx,g:www-data:rwx /usr/share/freeswitch/sounds

debian/resources/switch/package-release.sh

@@ -9,11 +9,25 @@ else
         echo "deb http://files.freeswitch.org/repo/deb/freeswitch-1.6/ jessie main" > /etc/apt/sources.list.d/freeswitch.list
         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 freeswitch-all freeswitch-all-dbg gdb
+apt-get update
-#apt-get remove freeswitch-all freeswitch-all-dbg
+apt-get install -y --force-yes gdb
-#rm /etc/apt/sources.list.d/freeswitch.list
+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-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
+apt-get install -y --force-yes freeswitch-mod-hash freeswitch-mod-esl freeswitch-mod-esf freeswitch-mod-fsv freeswitch-mod-valet-parking freeswitch-mod-dialplan-xml freeswitch-dbg
+apt-get install -y --force-yes freeswitch-mod-sndfile freeswitch-mod-native-file freeswitch-mod-local-stream freeswitch-mod-tone-stream freeswitch-mod-lua freeswitch-meta-mod-say
+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:'
 
 #set the file permissions
+mkdir /usr/share/freeswitch/scripts
+chmod g+ws /usr/share/freeswitch/scripts
+
 chown -R freeswitch:freeswitch /var/lib/freeswitch
 chmod -R g+s /var/lib/freeswitch
 setfacl -R -m u:www-data:rwx,g:www-data:rwx /var/lib/freeswitch