From 1ef3e13b0b12c27987fb161c55c42d53d79f7af1 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Thu, 15 Mar 2012 16:27:59 +0000 Subject: [PATCH 01/32] Sanitize directory tree --- debian/rules | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 8b00b1780..a555755ae 100755 --- a/debian/rules +++ b/debian/rules @@ -175,7 +175,23 @@ config.status: configure touch modules.conf echo $(MODULES) for i in $(MODULES); do echo $$i >> modules.conf; done - ./configure --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} + ./configure --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --localstatedir=/var \ + --sysconfdir=/etc/freeswitch \ + --datarootdir=/usr/share \ + --libexecdir=/usr/lib/freeswitch \ + --libdir=/usr/lib/freeswitch \ + --includedir=/usr/include/freeswitch \ + --with-recordingsdir=/var/spool/freeswitch/recordings \ + --with-dbdir=/var/spool/freeswitch/db \ + --with-pkgconfigdir=/usr/lib/pkgconfig \ + --with-logfiledir=/var/log/freeswitch \ + --with-modinstdir=/usr/lib/freeswitch/mod \ + --with-rundir=/run/freeswitch \ + --prefix=/usr/share/freeswitch \ + --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} build: build-stamp build-stamp: config.status From 3c79dd05a3df00e09fd97a8a4dee8b0fdca4b81d Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 07:32:15 +0000 Subject: [PATCH 02/32] Add bootstrap rule again --- debian/rules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/rules b/debian/rules index a555755ae..53ede31b5 100755 --- a/debian/rules +++ b/debian/rules @@ -193,6 +193,12 @@ config.status: configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} +configure: bootstrap.sh # .pc/applied-patches + dh_testdir + test -e /usr/share/misc/config.sub && cp -f /usr/share/misc/config.sub build/config/config.sub + test -e /usr/share/misc/config.guess && cp -f /usr/share/misc/config.guess build/config/config.guess + AUTOCONF=${AUTOCONF} ./bootstrap.sh + build: build-stamp build-stamp: config.status dh_testdir From 6bae8cb6a755d7b36156bee893ec9c34264593bc Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:07:46 +0100 Subject: [PATCH 03/32] Update freeswitch package files to the new tree hierarchy --- debian/dirs | 6 +- debian/freeswitch.conffiles | 196 ++++++++++----------- debian/freeswitch.install | 340 ++++++++++++++++++------------------ 3 files changed, 269 insertions(+), 273 deletions(-) diff --git a/debian/dirs b/debian/dirs index e2957b06b..705cf60fe 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,5 +1,3 @@ -opt/freeswitch/log -opt/freeswitch/db -opt/freeswitch/bin/scripts +var/log/freeswitch +var/spool/freeswitch/db etc/monit - diff --git a/debian/freeswitch.conffiles b/debian/freeswitch.conffiles index c765625b6..f06b11db4 100644 --- a/debian/freeswitch.conffiles +++ b/debian/freeswitch.conffiles @@ -1,98 +1,98 @@ -/opt/freeswitch/conf/autoload_configs/acl.conf.xml -/opt/freeswitch/conf/autoload_configs/alsa.conf.xml -/opt/freeswitch/conf/autoload_configs/callcenter.conf.xml -/opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml -/opt/freeswitch/conf/autoload_configs/cidlookup.conf.xml -/opt/freeswitch/conf/autoload_configs/conference.conf.xml -/opt/freeswitch/conf/autoload_configs/console.conf.xml -/opt/freeswitch/conf/autoload_configs/db.conf.xml -/opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml -/opt/freeswitch/conf/autoload_configs/dingaling.conf.xml -/opt/freeswitch/conf/autoload_configs/directory.conf.xml -/opt/freeswitch/conf/autoload_configs/easyroute.conf.xml -/opt/freeswitch/conf/autoload_configs/enum.conf.xml -/opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml -/opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -/opt/freeswitch/conf/autoload_configs/fax.conf.xml -/opt/freeswitch/conf/autoload_configs/fifo.conf.xml -/opt/freeswitch/conf/autoload_configs/ivr.conf.xml -/opt/freeswitch/conf/autoload_configs/java.conf.xml -/opt/freeswitch/conf/autoload_configs/lcr.conf.xml -/opt/freeswitch/conf/autoload_configs/local_stream.conf.xml -/opt/freeswitch/conf/autoload_configs/logfile.conf.xml -/opt/freeswitch/conf/autoload_configs/memcache.conf.xml -/opt/freeswitch/conf/autoload_configs/modules.conf.xml -/opt/freeswitch/conf/autoload_configs/mongo.conf.xml -/opt/freeswitch/conf/autoload_configs/nibblebill.conf.xml -/opt/freeswitch/conf/autoload_configs/opal.conf.xml -/opt/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml -/opt/freeswitch/conf/autoload_configs/portaudio.conf.xml -/opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml -/opt/freeswitch/conf/autoload_configs/rss.conf.xml -/opt/freeswitch/conf/autoload_configs/shout.conf.xml -/opt/freeswitch/conf/autoload_configs/skinny.conf.xml -/opt/freeswitch/conf/autoload_configs/sofia.conf.xml -/opt/freeswitch/conf/autoload_configs/switch.conf.xml -/opt/freeswitch/conf/autoload_configs/syslog.conf.xml -/opt/freeswitch/conf/autoload_configs/timezones.conf.xml -/opt/freeswitch/conf/autoload_configs/tts_commandline.conf.xml -/opt/freeswitch/conf/autoload_configs/unicall.conf.xml -/opt/freeswitch/conf/autoload_configs/voicemail.conf.xml -/opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml -/opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -/opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml -/opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml -/opt/freeswitch/conf/dialplan/default/00_pizza_demo.xml -/opt/freeswitch/conf/dialplan/default/01_example.com.xml -/opt/freeswitch/conf/dialplan/default.xml -/opt/freeswitch/conf/dialplan/features.xml -/opt/freeswitch/conf/dialplan/public/00_inbound_did.xml -/opt/freeswitch/conf/dialplan/public.xml -/opt/freeswitch/conf/dialplan/skinny-patterns/20-Demo.xml -/opt/freeswitch/conf/dialplan/skinny-patterns/99-Default_Drop.xml -/opt/freeswitch/conf/dialplan/skinny-patterns/20-Local_extension.xml -/opt/freeswitch/conf/dialplan/skinny-patterns/90-External.xml -/opt/freeswitch/conf/dialplan/skinny-patterns.xml -/opt/freeswitch/conf/directory/default/1000.xml -/opt/freeswitch/conf/directory/default/1001.xml -/opt/freeswitch/conf/directory/default/1002.xml -/opt/freeswitch/conf/directory/default/1003.xml -/opt/freeswitch/conf/directory/default/1004.xml -/opt/freeswitch/conf/directory/default/1005.xml -/opt/freeswitch/conf/directory/default/1006.xml -/opt/freeswitch/conf/directory/default/1007.xml -/opt/freeswitch/conf/directory/default/1008.xml -/opt/freeswitch/conf/directory/default/1009.xml -/opt/freeswitch/conf/directory/default/1010.xml -/opt/freeswitch/conf/directory/default/1011.xml -/opt/freeswitch/conf/directory/default/1012.xml -/opt/freeswitch/conf/directory/default/1013.xml -/opt/freeswitch/conf/directory/default/1014.xml -/opt/freeswitch/conf/directory/default/1015.xml -/opt/freeswitch/conf/directory/default/1016.xml -/opt/freeswitch/conf/directory/default/1017.xml -/opt/freeswitch/conf/directory/default/1018.xml -/opt/freeswitch/conf/directory/default/1019.xml -/opt/freeswitch/conf/directory/default/brian.xml -/opt/freeswitch/conf/directory/default/default.xml -/opt/freeswitch/conf/directory/default/example.com.xml -/opt/freeswitch/conf/directory/default/skinny-example.xml -/opt/freeswitch/conf/directory/default.xml -/opt/freeswitch/conf/extensions.conf -/opt/freeswitch/conf/freeswitch.xml -/opt/freeswitch/conf/fur_elise.ttml -/opt/freeswitch/conf/ivr_menus/demo_ivr.xml -/opt/freeswitch/conf/jingle_profiles/client.xml -/opt/freeswitch/conf/jingle_profiles/server.xml -/opt/freeswitch/conf/mime.types -/opt/freeswitch/conf/notify-voicemail.tpl -/opt/freeswitch/conf/sip_profiles/external/example.xml -/opt/freeswitch/conf/sip_profiles/external.xml -/opt/freeswitch/conf/sip_profiles/internal/example.xml -/opt/freeswitch/conf/sip_profiles/internal-ipv6.xml -/opt/freeswitch/conf/sip_profiles/internal.xml -/opt/freeswitch/conf/skinny_profiles/internal.xml -/opt/freeswitch/conf/tetris.ttml -/opt/freeswitch/conf/vars.xml -/opt/freeswitch/conf/voicemail.tpl -/opt/freeswitch/conf/web-vm.tpl +etc/freeswitch/autoload_configs/acl.conf.xml +etc/freeswitch/autoload_configs/alsa.conf.xml +etc/freeswitch/autoload_configs/callcenter.conf.xml +etc/freeswitch/autoload_configs/cdr_csv.conf.xml +etc/freeswitch/autoload_configs/cidlookup.conf.xml +etc/freeswitch/autoload_configs/conference.conf.xml +etc/freeswitch/autoload_configs/console.conf.xml +etc/freeswitch/autoload_configs/db.conf.xml +etc/freeswitch/autoload_configs/dialplan_directory.conf.xml +etc/freeswitch/autoload_configs/dingaling.conf.xml +etc/freeswitch/autoload_configs/directory.conf.xml +etc/freeswitch/autoload_configs/easyroute.conf.xml +etc/freeswitch/autoload_configs/enum.conf.xml +etc/freeswitch/autoload_configs/event_multicast.conf.xml +etc/freeswitch/autoload_configs/event_socket.conf.xml +etc/freeswitch/autoload_configs/fax.conf.xml +etc/freeswitch/autoload_configs/fifo.conf.xml +etc/freeswitch/autoload_configs/ivr.conf.xml +etc/freeswitch/autoload_configs/java.conf.xml +etc/freeswitch/autoload_configs/lcr.conf.xml +etc/freeswitch/autoload_configs/local_stream.conf.xml +etc/freeswitch/autoload_configs/logfile.conf.xml +etc/freeswitch/autoload_configs/memcache.conf.xml +etc/freeswitch/autoload_configs/modules.conf.xml +etc/freeswitch/autoload_configs/mongo.conf.xml +etc/freeswitch/autoload_configs/nibblebill.conf.xml +etc/freeswitch/autoload_configs/opal.conf.xml +etc/freeswitch/autoload_configs/pocketsphinx.conf.xml +etc/freeswitch/autoload_configs/portaudio.conf.xml +etc/freeswitch/autoload_configs/post_load_modules.conf.xml +etc/freeswitch/autoload_configs/rss.conf.xml +etc/freeswitch/autoload_configs/shout.conf.xml +etc/freeswitch/autoload_configs/skinny.conf.xml +etc/freeswitch/autoload_configs/sofia.conf.xml +etc/freeswitch/autoload_configs/switch.conf.xml +etc/freeswitch/autoload_configs/syslog.conf.xml +etc/freeswitch/autoload_configs/timezones.conf.xml +etc/freeswitch/autoload_configs/tts_commandline.conf.xml +etc/freeswitch/autoload_configs/unicall.conf.xml +etc/freeswitch/autoload_configs/voicemail.conf.xml +etc/freeswitch/autoload_configs/xml_cdr.conf.xml +etc/freeswitch/autoload_configs/xml_curl.conf.xml +etc/freeswitch/autoload_configs/xml_rpc.conf.xml +etc/freeswitch/autoload_configs/zeroconf.conf.xml +etc/freeswitch/dialplan/default/00_pizza_demo.xml +etc/freeswitch/dialplan/default/01_example.com.xml +etc/freeswitch/dialplan/default.xml +etc/freeswitch/dialplan/features.xml +etc/freeswitch/dialplan/public/00_inbound_did.xml +etc/freeswitch/dialplan/public.xml +etc/freeswitch/dialplan/skinny-patterns/20-Demo.xml +etc/freeswitch/dialplan/skinny-patterns/99-Default_Drop.xml +etc/freeswitch/dialplan/skinny-patterns/20-Local_extension.xml +etc/freeswitch/dialplan/skinny-patterns/90-External.xml +etc/freeswitch/dialplan/skinny-patterns.xml +etc/freeswitch/directory/default/1000.xml +etc/freeswitch/directory/default/1001.xml +etc/freeswitch/directory/default/1002.xml +etc/freeswitch/directory/default/1003.xml +etc/freeswitch/directory/default/1004.xml +etc/freeswitch/directory/default/1005.xml +etc/freeswitch/directory/default/1006.xml +etc/freeswitch/directory/default/1007.xml +etc/freeswitch/directory/default/1008.xml +etc/freeswitch/directory/default/1009.xml +etc/freeswitch/directory/default/1010.xml +etc/freeswitch/directory/default/1011.xml +etc/freeswitch/directory/default/1012.xml +etc/freeswitch/directory/default/1013.xml +etc/freeswitch/directory/default/1014.xml +etc/freeswitch/directory/default/1015.xml +etc/freeswitch/directory/default/1016.xml +etc/freeswitch/directory/default/1017.xml +etc/freeswitch/directory/default/1018.xml +etc/freeswitch/directory/default/1019.xml +etc/freeswitch/directory/default/brian.xml +etc/freeswitch/directory/default/default.xml +etc/freeswitch/directory/default/example.com.xml +etc/freeswitch/directory/default/skinny-example.xml +etc/freeswitch/directory/default.xml +etc/freeswitch/extensions.conf +etc/freeswitch/freeswitch.xml +etc/freeswitch/fur_elise.ttml +etc/freeswitch/ivr_menus/demo_ivr.xml +etc/freeswitch/jingle_profiles/client.xml +etc/freeswitch/jingle_profiles/server.xml +etc/freeswitch/mime.types +etc/freeswitch/notify-voicemail.tpl +etc/freeswitch/sip_profiles/external/example.xml +etc/freeswitch/sip_profiles/external.xml +etc/freeswitch/sip_profiles/internal/example.xml +etc/freeswitch/sip_profiles/internal-ipv6.xml +etc/freeswitch/sip_profiles/internal.xml +etc/freeswitch/skinny_profiles/internal.xml +etc/freeswitch/tetris.ttml +etc/freeswitch/vars.xml +etc/freeswitch/voicemail.tpl +etc/freeswitch/web-vm.tpl diff --git a/debian/freeswitch.install b/debian/freeswitch.install index a72200294..c3c008dfe 100644 --- a/debian/freeswitch.install +++ b/debian/freeswitch.install @@ -1,171 +1,169 @@ -opt/freeswitch/bin/freeswitch -opt/freeswitch/bin/fs_cli -opt/freeswitch/bin/fs_encode -opt/freeswitch/bin/fs_ivrd -opt/freeswitch/bin/fsxs -opt/freeswitch/bin/gentls_cert -opt/freeswitch/conf/autoload_configs/acl.conf.xml -opt/freeswitch/conf/autoload_configs/alsa.conf.xml -opt/freeswitch/conf/autoload_configs/callcenter.conf.xml -opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml -opt/freeswitch/conf/autoload_configs/cidlookup.conf.xml -opt/freeswitch/conf/autoload_configs/conference.conf.xml -opt/freeswitch/conf/autoload_configs/console.conf.xml -opt/freeswitch/conf/autoload_configs/db.conf.xml -opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml -opt/freeswitch/conf/autoload_configs/dingaling.conf.xml -opt/freeswitch/conf/autoload_configs/directory.conf.xml -opt/freeswitch/conf/autoload_configs/easyroute.conf.xml -opt/freeswitch/conf/autoload_configs/enum.conf.xml -opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml -opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -opt/freeswitch/conf/autoload_configs/fax.conf.xml -opt/freeswitch/conf/autoload_configs/spandsp.conf.xml -opt/freeswitch/conf/autoload_configs/fifo.conf.xml -opt/freeswitch/conf/autoload_configs/ivr.conf.xml -opt/freeswitch/conf/autoload_configs/java.conf.xml -opt/freeswitch/conf/autoload_configs/lcr.conf.xml -opt/freeswitch/conf/autoload_configs/local_stream.conf.xml -opt/freeswitch/conf/autoload_configs/logfile.conf.xml -opt/freeswitch/conf/autoload_configs/memcache.conf.xml -opt/freeswitch/conf/autoload_configs/modules.conf.xml -opt/freeswitch/conf/autoload_configs/mongo.conf.xml -opt/freeswitch/conf/autoload_configs/nibblebill.conf.xml -opt/freeswitch/conf/autoload_configs/opal.conf.xml -opt/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml -opt/freeswitch/conf/autoload_configs/portaudio.conf.xml -opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml -opt/freeswitch/conf/autoload_configs/rss.conf.xml -opt/freeswitch/conf/autoload_configs/shout.conf.xml -opt/freeswitch/conf/autoload_configs/skinny.conf.xml -opt/freeswitch/conf/autoload_configs/sofia.conf.xml -opt/freeswitch/conf/autoload_configs/switch.conf.xml -opt/freeswitch/conf/autoload_configs/syslog.conf.xml -opt/freeswitch/conf/autoload_configs/timezones.conf.xml -opt/freeswitch/conf/autoload_configs/tts_commandline.conf.xml -opt/freeswitch/conf/autoload_configs/unicall.conf.xml -opt/freeswitch/conf/autoload_configs/voicemail.conf.xml -opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml -opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml -opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml -opt/freeswitch/conf/dialplan/default/00_pizza_demo.xml -opt/freeswitch/conf/dialplan/default/01_example.com.xml -opt/freeswitch/conf/dialplan/default.xml -opt/freeswitch/conf/dialplan/features.xml -opt/freeswitch/conf/dialplan/public/00_inbound_did.xml -opt/freeswitch/conf/dialplan/public.xml -opt/freeswitch/conf/dialplan/skinny-patterns/20-Demo.xml -opt/freeswitch/conf/dialplan/skinny-patterns/99-Default_Drop.xml -opt/freeswitch/conf/dialplan/skinny-patterns/20-Local_extension.xml -opt/freeswitch/conf/dialplan/skinny-patterns/90-External.xml -opt/freeswitch/conf/dialplan/skinny-patterns.xml -opt/freeswitch/conf/directory/default/1000.xml -opt/freeswitch/conf/directory/default/1001.xml -opt/freeswitch/conf/directory/default/1002.xml -opt/freeswitch/conf/directory/default/1003.xml -opt/freeswitch/conf/directory/default/1004.xml -opt/freeswitch/conf/directory/default/1005.xml -opt/freeswitch/conf/directory/default/1006.xml -opt/freeswitch/conf/directory/default/1007.xml -opt/freeswitch/conf/directory/default/1008.xml -opt/freeswitch/conf/directory/default/1009.xml -opt/freeswitch/conf/directory/default/1010.xml -opt/freeswitch/conf/directory/default/1011.xml -opt/freeswitch/conf/directory/default/1012.xml -opt/freeswitch/conf/directory/default/1013.xml -opt/freeswitch/conf/directory/default/1014.xml -opt/freeswitch/conf/directory/default/1015.xml -opt/freeswitch/conf/directory/default/1016.xml -opt/freeswitch/conf/directory/default/1017.xml -opt/freeswitch/conf/directory/default/1018.xml -opt/freeswitch/conf/directory/default/1019.xml -opt/freeswitch/conf/directory/default/brian.xml -opt/freeswitch/conf/directory/default/default.xml -opt/freeswitch/conf/directory/default/example.com.xml -opt/freeswitch/conf/directory/default/skinny-example.xml -opt/freeswitch/conf/directory/default.xml -opt/freeswitch/conf/extensions.conf -opt/freeswitch/conf/freeswitch.xml -opt/freeswitch/conf/fur_elise.ttml -opt/freeswitch/conf/ivr_menus/demo_ivr.xml -opt/freeswitch/conf/jingle_profiles/client.xml -opt/freeswitch/conf/jingle_profiles/server.xml -opt/freeswitch/conf/mime.types -opt/freeswitch/conf/notify-voicemail.tpl -opt/freeswitch/conf/sip_profiles/external/example.xml -opt/freeswitch/conf/sip_profiles/external.xml -opt/freeswitch/conf/sip_profiles/internal/example.xml -opt/freeswitch/conf/sip_profiles/internal-ipv6.xml -opt/freeswitch/conf/sip_profiles/internal.xml -opt/freeswitch/conf/skinny_profiles/internal.xml -opt/freeswitch/conf/tetris.ttml -opt/freeswitch/conf/vars.xml -opt/freeswitch/conf/voicemail.tpl -opt/freeswitch/conf/web-vm.tpl -opt/freeswitch/htdocs/* -opt/freeswitch/lib/libfreeswitch*.so* -opt/freeswitch/mod/mod_avmd.so* -opt/freeswitch/mod/mod_bv.so* -opt/freeswitch/mod/mod_callcenter.so* -opt/freeswitch/mod/mod_cdr_csv.so* -opt/freeswitch/mod/mod_celt.so* -opt/freeswitch/mod/mod_cidlookup.so* -opt/freeswitch/mod/mod_cluechoo.so* -opt/freeswitch/mod/mod_console.so* -opt/freeswitch/mod/mod_codec2.so* -opt/freeswitch/mod/mod_commands.so* -opt/freeswitch/mod/mod_conference.so* -opt/freeswitch/mod/mod_console.so* -opt/freeswitch/mod/mod_curl.so* -opt/freeswitch/mod/mod_db.so* -opt/freeswitch/mod/mod_dialplan*.so* -opt/freeswitch/mod/mod_dingaling.so* -opt/freeswitch/mod/mod_directory.so* -opt/freeswitch/mod/mod_distributor.so* -opt/freeswitch/mod/mod_dptools.so* -opt/freeswitch/mod/mod_easyroute.so* -opt/freeswitch/mod/mod_enum.so* -opt/freeswitch/mod/mod_esf.so* -opt/freeswitch/mod/mod_event_*.so* -opt/freeswitch/mod/mod_expr.so* -opt/freeswitch/mod/mod_fifo.so* -opt/freeswitch/mod/mod_flite.so* -opt/freeswitch/mod/mod_fsv.so* -opt/freeswitch/mod/mod_hash.so* -opt/freeswitch/mod/mod_h26x.so* -opt/freeswitch/mod/mod_ilbc.so* -opt/freeswitch/mod/mod_lcr.so* -opt/freeswitch/mod/mod_limit.so* -opt/freeswitch/mod/mod_local_stream.so* -opt/freeswitch/mod/mod_logfile.so* -opt/freeswitch/mod/mod_loopback.so* -opt/freeswitch/mod/mod_memcache.so* -opt/freeswitch/mod/mod_mp4v.so* -opt/freeswitch/mod/mod_native_file.so* -opt/freeswitch/mod/mod_nibblebill.so* -opt/freeswitch/mod/mod_portaudio.so* -opt/freeswitch/mod/mod_portaudio_stream.so* -opt/freeswitch/mod/mod_redis.so* -opt/freeswitch/mod/mod_rss.so* -opt/freeswitch/mod/mod_shout.so* -opt/freeswitch/mod/mod_silk.so* -opt/freeswitch/mod/mod_siren.so* -opt/freeswitch/mod/mod_skinny.so* -opt/freeswitch/mod/mod_skypopen.so* -opt/freeswitch/mod/mod_sndfile.so* -opt/freeswitch/mod/mod_snom.so* -opt/freeswitch/mod/mod_cdr_sqlite.so* -opt/freeswitch/mod/mod_sofia.so* -opt/freeswitch/mod/mod_spandsp.so* -opt/freeswitch/mod/mod_speex.so* -opt/freeswitch/mod/mod_spy.so* -opt/freeswitch/mod/mod_syslog.so* -opt/freeswitch/mod/mod_theora.so* -opt/freeswitch/mod/mod_timerfd.so* -opt/freeswitch/mod/mod_tone_stream.so* -opt/freeswitch/mod/mod_tts_commandline.so* -opt/freeswitch/mod/mod_valet_parking.so* -opt/freeswitch/mod/mod_vmd.so* -opt/freeswitch/mod/mod_voicemail.so* -opt/freeswitch/mod/mod_xml_*.so* +usr/bin/freeswitch +usr/bin/fs_cli +usr/bin/fs_encode +usr/bin/fs_ivrd +usr/bin/fsxs +usr/bin/gentls_cert +etc/freeswitch/autoload_configs/acl.conf.xml +etc/freeswitch/autoload_configs/alsa.conf.xml +etc/freeswitch/autoload_configs/callcenter.conf.xml +etc/freeswitch/autoload_configs/cdr_csv.conf.xml +etc/freeswitch/autoload_configs/cidlookup.conf.xml +etc/freeswitch/autoload_configs/conference.conf.xml +etc/freeswitch/autoload_configs/console.conf.xml +etc/freeswitch/autoload_configs/db.conf.xml +etc/freeswitch/autoload_configs/dialplan_directory.conf.xml +etc/freeswitch/autoload_configs/dingaling.conf.xml +etc/freeswitch/autoload_configs/directory.conf.xml +etc/freeswitch/autoload_configs/easyroute.conf.xml +etc/freeswitch/autoload_configs/enum.conf.xml +etc/freeswitch/autoload_configs/event_multicast.conf.xml +etc/freeswitch/autoload_configs/event_socket.conf.xml +etc/freeswitch/autoload_configs/fax.conf.xml +etc/freeswitch/autoload_configs/fifo.conf.xml +etc/freeswitch/autoload_configs/ivr.conf.xml +etc/freeswitch/autoload_configs/java.conf.xml +etc/freeswitch/autoload_configs/lcr.conf.xml +etc/freeswitch/autoload_configs/local_stream.conf.xml +etc/freeswitch/autoload_configs/logfile.conf.xml +etc/freeswitch/autoload_configs/memcache.conf.xml +etc/freeswitch/autoload_configs/modules.conf.xml +etc/freeswitch/autoload_configs/mongo.conf.xml +etc/freeswitch/autoload_configs/nibblebill.conf.xml +etc/freeswitch/autoload_configs/opal.conf.xml +etc/freeswitch/autoload_configs/pocketsphinx.conf.xml +etc/freeswitch/autoload_configs/portaudio.conf.xml +etc/freeswitch/autoload_configs/post_load_modules.conf.xml +etc/freeswitch/autoload_configs/rss.conf.xml +etc/freeswitch/autoload_configs/shout.conf.xml +etc/freeswitch/autoload_configs/skinny.conf.xml +etc/freeswitch/autoload_configs/sofia.conf.xml +etc/freeswitch/autoload_configs/switch.conf.xml +etc/freeswitch/autoload_configs/syslog.conf.xml +etc/freeswitch/autoload_configs/timezones.conf.xml +etc/freeswitch/autoload_configs/tts_commandline.conf.xml +etc/freeswitch/autoload_configs/unicall.conf.xml +etc/freeswitch/autoload_configs/voicemail.conf.xml +etc/freeswitch/autoload_configs/xml_cdr.conf.xml +etc/freeswitch/autoload_configs/xml_curl.conf.xml +etc/freeswitch/autoload_configs/xml_rpc.conf.xml +etc/freeswitch/autoload_configs/zeroconf.conf.xml +etc/freeswitch/dialplan/default/00_pizza_demo.xml +etc/freeswitch/dialplan/default/01_example.com.xml +etc/freeswitch/dialplan/default.xml +etc/freeswitch/dialplan/features.xml +etc/freeswitch/dialplan/public/00_inbound_did.xml +etc/freeswitch/dialplan/public.xml +etc/freeswitch/dialplan/skinny-patterns/20-Demo.xml +etc/freeswitch/dialplan/skinny-patterns/99-Default_Drop.xml +etc/freeswitch/dialplan/skinny-patterns/20-Local_extension.xml +etc/freeswitch/dialplan/skinny-patterns/90-External.xml +etc/freeswitch/dialplan/skinny-patterns.xml +etc/freeswitch/directory/default/1000.xml +etc/freeswitch/directory/default/1001.xml +etc/freeswitch/directory/default/1002.xml +etc/freeswitch/directory/default/1003.xml +etc/freeswitch/directory/default/1004.xml +etc/freeswitch/directory/default/1005.xml +etc/freeswitch/directory/default/1006.xml +etc/freeswitch/directory/default/1007.xml +etc/freeswitch/directory/default/1008.xml +etc/freeswitch/directory/default/1009.xml +etc/freeswitch/directory/default/1010.xml +etc/freeswitch/directory/default/1011.xml +etc/freeswitch/directory/default/1012.xml +etc/freeswitch/directory/default/1013.xml +etc/freeswitch/directory/default/1014.xml +etc/freeswitch/directory/default/1015.xml +etc/freeswitch/directory/default/1016.xml +etc/freeswitch/directory/default/1017.xml +etc/freeswitch/directory/default/1018.xml +etc/freeswitch/directory/default/1019.xml +etc/freeswitch/directory/default/brian.xml +etc/freeswitch/directory/default/default.xml +etc/freeswitch/directory/default/example.com.xml +etc/freeswitch/directory/default/skinny-example.xml +etc/freeswitch/directory/default.xml +etc/freeswitch/extensions.conf +etc/freeswitch/freeswitch.xml +etc/freeswitch/fur_elise.ttml +etc/freeswitch/ivr_menus/demo_ivr.xml +etc/freeswitch/jingle_profiles/client.xml +etc/freeswitch/jingle_profiles/server.xml +etc/freeswitch/mime.types +etc/freeswitch/notify-voicemail.tpl +etc/freeswitch/sip_profiles/external/example.xml +etc/freeswitch/sip_profiles/external.xml +etc/freeswitch/sip_profiles/internal/example.xml +etc/freeswitch/sip_profiles/internal-ipv6.xml +etc/freeswitch/sip_profiles/internal.xml +etc/freeswitch/skinny_profiles/internal.xml +etc/freeswitch/tetris.ttml +etc/freeswitch/vars.xml +etc/freeswitch/voicemail.tpl +etc/freeswitch/web-vm.tpl +usr/lib/freeswitch/libfreeswitch*.so* +usr/lib/freeswitch/mod/mod_avmd.so* +usr/lib/freeswitch/mod/mod_bv.so* +usr/lib/freeswitch/mod/mod_callcenter.so* +usr/lib/freeswitch/mod/mod_cdr_csv.so* +usr/lib/freeswitch/mod/mod_celt.so* +usr/lib/freeswitch/mod/mod_cidlookup.so* +usr/lib/freeswitch/mod/mod_cluechoo.so* +usr/lib/freeswitch/mod/mod_console.so* +usr/lib/freeswitch/mod/mod_codec2.so* +usr/lib/freeswitch/mod/mod_commands.so* +usr/lib/freeswitch/mod/mod_conference.so* +usr/lib/freeswitch/mod/mod_console.so* +usr/lib/freeswitch/mod/mod_curl.so* +usr/lib/freeswitch/mod/mod_db.so* +usr/lib/freeswitch/mod/mod_dialplan*.so* +usr/lib/freeswitch/mod/mod_dingaling.so* +usr/lib/freeswitch/mod/mod_directory.so* +usr/lib/freeswitch/mod/mod_distributor.so* +usr/lib/freeswitch/mod/mod_dptools.so* +usr/lib/freeswitch/mod/mod_easyroute.so* +usr/lib/freeswitch/mod/mod_enum.so* +usr/lib/freeswitch/mod/mod_esf.so* +usr/lib/freeswitch/mod/mod_event_*.so* +usr/lib/freeswitch/mod/mod_expr.so* +usr/lib/freeswitch/mod/mod_fifo.so* +usr/lib/freeswitch/mod/mod_flite.so* +usr/lib/freeswitch/mod/mod_fsv.so* +usr/lib/freeswitch/mod/mod_hash.so* +usr/lib/freeswitch/mod/mod_h26x.so* +usr/lib/freeswitch/mod/mod_ilbc.so* +usr/lib/freeswitch/mod/mod_lcr.so* +usr/lib/freeswitch/mod/mod_limit.so* +usr/lib/freeswitch/mod/mod_local_stream.so* +usr/lib/freeswitch/mod/mod_logfile.so* +usr/lib/freeswitch/mod/mod_loopback.so* +usr/lib/freeswitch/mod/mod_memcache.so* +usr/lib/freeswitch/mod/mod_mp4v.so* +usr/lib/freeswitch/mod/mod_native_file.so* +usr/lib/freeswitch/mod/mod_nibblebill.so* +usr/lib/freeswitch/mod/mod_portaudio.so* +usr/lib/freeswitch/mod/mod_portaudio_stream.so* +usr/lib/freeswitch/mod/mod_redis.so* +usr/lib/freeswitch/mod/mod_rss.so* +usr/lib/freeswitch/mod/mod_shout.so* +usr/lib/freeswitch/mod/mod_silk.so* +usr/lib/freeswitch/mod/mod_siren.so* +usr/lib/freeswitch/mod/mod_skinny.so* +usr/lib/freeswitch/mod/mod_skypopen.so* +usr/lib/freeswitch/mod/mod_sndfile.so* +usr/lib/freeswitch/mod/mod_snom.so* +usr/lib/freeswitch/mod/mod_cdr_sqlite.so* +usr/lib/freeswitch/mod/mod_sofia.so* +usr/lib/freeswitch/mod/mod_spandsp.so* +usr/lib/freeswitch/mod/mod_speex.so* +usr/lib/freeswitch/mod/mod_spy.so* +usr/lib/freeswitch/mod/mod_syslog.so* +usr/lib/freeswitch/mod/mod_theora.so* +usr/lib/freeswitch/mod/mod_timerfd.so* +usr/lib/freeswitch/mod/mod_tone_stream.so* +usr/lib/freeswitch/mod/mod_tts_commandline.so* +usr/lib/freeswitch/mod/mod_valet_parking.so* +usr/lib/freeswitch/mod/mod_vmd.so* +usr/lib/freeswitch/mod/mod_voicemail.so* +usr/lib/freeswitch/mod/mod_xml_*.so* From 3effc5c1041b8eaaae939b9451603a5c3f5d02c3 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:08:15 +0100 Subject: [PATCH 04/32] Update freeswitch-dev package files to the new tree hierarchy --- debian/freeswitch-dev.install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/freeswitch-dev.install b/debian/freeswitch-dev.install index 9fcb97c81..5ecd9789b 100644 --- a/debian/freeswitch-dev.install +++ b/debian/freeswitch-dev.install @@ -1,5 +1,5 @@ -opt/freeswitch/include/* -opt/freeswitch/lib/*.a -opt/freeswitch/lib/*.la -opt/freeswitch/mod/*.a -opt/freeswitch/mod/*.la +usr/include/freeswitch/* +usr/lib/freeswitch/*.a +usr/lib/freeswitch/*.la +usr/lib/freeswitch/mod/*.a +usr/lib/freeswitch/mod/*.la From 671ada3c27491d569074f0330aaf5fe23eab6510 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:09:03 +0100 Subject: [PATCH 05/32] Update freeswitch-codec-passthru-amr package files to the new tree hierarchy --- debian/freeswitch-codec-passthru-amr.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/freeswitch-codec-passthru-amr.install b/debian/freeswitch-codec-passthru-amr.install index c66668b30..555a86be2 100644 --- a/debian/freeswitch-codec-passthru-amr.install +++ b/debian/freeswitch-codec-passthru-amr.install @@ -1 +1 @@ -opt/freeswitch/mod/mod_amr.so* +usr/lib/freeswitch/mod/mod_amr.so* From 76937aa1424e401374ec4df35785b069d121172d Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:09:30 +0100 Subject: [PATCH 06/32] Update freeswitch-codec-passthru-amrwb package files to the new tree hierarchy --- debian/freeswitch-codec-passthru-amrwb.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/freeswitch-codec-passthru-amrwb.install b/debian/freeswitch-codec-passthru-amrwb.install index 022462d00..3b08ae8a4 100644 --- a/debian/freeswitch-codec-passthru-amrwb.install +++ b/debian/freeswitch-codec-passthru-amrwb.install @@ -1 +1 @@ -opt/freeswitch/mod/mod_amrwb.so* +usr/lib/freeswitch/mod/mod_amrwb.so* From f2b6080ad5d5d1f06788f3999687181add753d49 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:09:55 +0100 Subject: [PATCH 07/32] Update freeswitch-codec-passthru-g7321 package files to the new tree hierarchy --- debian/freeswitch-codec-passthru-g7231.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/freeswitch-codec-passthru-g7231.install b/debian/freeswitch-codec-passthru-g7231.install index 4a0ab0c2c..071967896 100644 --- a/debian/freeswitch-codec-passthru-g7231.install +++ b/debian/freeswitch-codec-passthru-g7231.install @@ -1 +1 @@ -opt/freeswitch/mod/mod_g723_1.so* +usr/lib/freeswitch/mod/mod_g723_1.so* From 99962fa353918acf0ac5875fd19a94633b13149f Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:10:25 +0100 Subject: [PATCH 08/32] Update freeswitch-codec-passthru-g729 package files to the new tree hierarchy --- debian/freeswitch-codec-passthru-g729.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/freeswitch-codec-passthru-g729.install b/debian/freeswitch-codec-passthru-g729.install index 0f94112f3..eb31f3b0d 100644 --- a/debian/freeswitch-codec-passthru-g729.install +++ b/debian/freeswitch-codec-passthru-g729.install @@ -1 +1 @@ -opt/freeswitch/mod/mod_g729.so* +usr/lib/freeswitch/mod/mod_g729.so* From 304a60d561de45b27e53a560827a93ce7994c04c Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:12:04 +0100 Subject: [PATCH 09/32] Update freeswitch-freetdm package files to the new tree hierarchy --- debian/freeswitch-freetdm.conffiles | 12 ++++++------ debian/freeswitch-freetdm.install | 19 +++++++++---------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/debian/freeswitch-freetdm.conffiles b/debian/freeswitch-freetdm.conffiles index f14e37f3d..775cd3ad4 100644 --- a/debian/freeswitch-freetdm.conffiles +++ b/debian/freeswitch-freetdm.conffiles @@ -1,6 +1,6 @@ -opt/freeswitch/conf/tones.conf -opt/freeswitch/conf/autoload_configs/freetdm.conf.xml -opt/freeswitch/conf/pika.conf -opt/freeswitch/conf/freetdm.conf -opt/freeswitch/conf/wanpipe.conf -opt/freeswitch/conf/zt.conf +etc/freeswitch/tones.conf +etc/freeswitch/autoload_configs/freetdm.conf.xml +etc/freeswitch/pika.conf +etc/freeswitch/freetdm.conf +etc/freeswitch/wanpipe.conf +etc/freeswitch/zt.conf diff --git a/debian/freeswitch-freetdm.install b/debian/freeswitch-freetdm.install index cdca887dd..94b787601 100644 --- a/debian/freeswitch-freetdm.install +++ b/debian/freeswitch-freetdm.install @@ -1,10 +1,9 @@ -opt/freeswitch/conf/tones.conf -opt/freeswitch/conf/autoload_configs/freetdm.conf.xml -opt/freeswitch/conf/pika.conf -opt/freeswitch/conf/freetdm.conf -opt/freeswitch/conf/wanpipe.conf -opt/freeswitch/conf/zt.conf -opt/freeswitch/lib/libfreetdm.so* -opt/freeswitch/mod/mod_freetdm.so* -opt/freeswitch/mod/ftm*.so* - +etc/freeswitch/tones.conf +etc/freeswitch/autoload_configs/freetdm.conf.xml +etc/freeswitch/pika.conf +etc/freeswitch/freetdm.conf +etc/freeswitch/wanpipe.conf +etc/freeswitch/zt.conf +usr/lib/freeswitch/libfreetdm.so* +usr/lib/freeswitch/mod/mod_freetdm.so* +usr/lib/freeswitch/mod/ftm*.so* From 9dd1cf3dcc618087de994b51f117fa2de8c825d2 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:14:22 +0100 Subject: [PATCH 10/32] Update freeswitch-lang-de package files to the new tree hierarchy --- debian/freeswitch-lang-de.conffiles | 8 ++++---- debian/freeswitch-lang-de.install | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/freeswitch-lang-de.conffiles b/debian/freeswitch-lang-de.conffiles index 5c1dded24..1a2f550d1 100644 --- a/debian/freeswitch-lang-de.conffiles +++ b/debian/freeswitch-lang-de.conffiles @@ -1,4 +1,4 @@ -/opt/freeswitch/conf/lang/de/demo/demo.xml -/opt/freeswitch/conf/lang/de/de.xml -/opt/freeswitch/conf/lang/de/vm/tts.xml -/opt/freeswitch/conf/lang/de/vm/sounds.xml +etc/freeswitch/lang/de/demo/demo.xml +etc/freeswitch/lang/de/de.xml +etc/freeswitch/lang/de/vm/tts.xml +etc/freeswitch/lang/de/vm/sounds.xml diff --git a/debian/freeswitch-lang-de.install b/debian/freeswitch-lang-de.install index 1b33ebec7..3d40d8a66 100644 --- a/debian/freeswitch-lang-de.install +++ b/debian/freeswitch-lang-de.install @@ -1,5 +1,5 @@ -opt/freeswitch/conf/lang/de/demo/demo.xml -opt/freeswitch/conf/lang/de/de.xml -opt/freeswitch/conf/lang/de/vm/tts.xml -/opt/freeswitch/conf/lang/de/vm/sounds.xml -opt/freeswitch/mod/mod_say_de.so* +etc/freeswitch/lang/de/demo/demo.xml +etc/freeswitch/lang/de/de.xml +etc/freeswitch/lang/de/vm/tts.xml +etc/freeswitch/lang/de/vm/sounds.xml +usr/lib/freeswitch/mod/mod_say_de.so* From ff10b031f940319439f2ff5ac89a9129a583a038 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:14:47 +0100 Subject: [PATCH 11/32] Update freeswitch-lang-en package files to the new tree hierarchy --- debian/freeswitch-lang-en.conffiles | 14 +++++++------- debian/freeswitch-lang-en.install | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/freeswitch-lang-en.conffiles b/debian/freeswitch-lang-en.conffiles index 10d607851..99dd5eecf 100644 --- a/debian/freeswitch-lang-en.conffiles +++ b/debian/freeswitch-lang-en.conffiles @@ -1,7 +1,7 @@ -/opt/freeswitch/conf/lang/en/demo/demo-ivr.xml -/opt/freeswitch/conf/lang/en/demo/demo.xml -/opt/freeswitch/conf/lang/en/dir/sounds.xml -/opt/freeswitch/conf/lang/en/dir/tts.xml -/opt/freeswitch/conf/lang/en/en.xml -/opt/freeswitch/conf/lang/en/vm/sounds.xml -/opt/freeswitch/conf/lang/en/vm/tts.xml +etc/freeswitch/lang/en/demo/demo-ivr.xml +etc/freeswitch/lang/en/demo/demo.xml +etc/freeswitch/lang/en/dir/sounds.xml +etc/freeswitch/lang/en/dir/tts.xml +etc/freeswitch/lang/en/en.xml +etc/freeswitch/lang/en/vm/sounds.xml +etc/freeswitch/lang/en/vm/tts.xml diff --git a/debian/freeswitch-lang-en.install b/debian/freeswitch-lang-en.install index 73b86280b..3ae5bc297 100644 --- a/debian/freeswitch-lang-en.install +++ b/debian/freeswitch-lang-en.install @@ -1,8 +1,8 @@ -opt/freeswitch/conf/lang/en/demo/demo-ivr.xml -opt/freeswitch/conf/lang/en/demo/demo.xml -opt/freeswitch/conf/lang/en/dir/sounds.xml -opt/freeswitch/conf/lang/en/dir/tts.xml -opt/freeswitch/conf/lang/en/en.xml -opt/freeswitch/conf/lang/en/vm/sounds.xml -opt/freeswitch/conf/lang/en/vm/tts.xml -opt/freeswitch/mod/mod_say_en.so* +etc/freeswitch/lang/en/demo/demo-ivr.xml +etc/freeswitch/lang/en/demo/demo.xml +etc/freeswitch/lang/en/dir/sounds.xml +etc/freeswitch/lang/en/dir/tts.xml +etc/freeswitch/lang/en/en.xml +etc/freeswitch/lang/en/vm/sounds.xml +etc/freeswitch/lang/en/vm/tts.xml +usr/lib/freeswitch/mod/mod_say_en.so* From e0c6fa0c2062621e7d9290a127be46337210d74f Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:17:26 +0100 Subject: [PATCH 12/32] Update freeswitch-lang-es package files to the new tree hierarchy --- debian/freeswitch-lang-es.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/freeswitch-lang-es.install b/debian/freeswitch-lang-es.install index fc91c7985..dbc74c342 100644 --- a/debian/freeswitch-lang-es.install +++ b/debian/freeswitch-lang-es.install @@ -1 +1 @@ -opt/freeswitch/mod/mod_say_es.so* +usr/lib/freeswitch/mod/mod_say_es.so* From 54d6af4f7495bb512e97b3968680ca03e4b941ae Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:30:53 +0100 Subject: [PATCH 13/32] Update freeswitch-lang-fr package files to the new tree hierarchy --- debian/freeswitch-lang-fr.conffiles | 10 +++++----- debian/freeswitch-lang-fr.install | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/freeswitch-lang-fr.conffiles b/debian/freeswitch-lang-fr.conffiles index 75055617e..e03c292c1 100644 --- a/debian/freeswitch-lang-fr.conffiles +++ b/debian/freeswitch-lang-fr.conffiles @@ -1,5 +1,5 @@ -/opt/freeswitch/conf/lang/fr/fr.xml -/opt/freeswitch/conf/lang/fr/demo/demo.xml -/opt/freeswitch/conf/lang/fr/dir/sounds.xml -/opt/freeswitch/conf/lang/fr/dir/tts.xml -/opt/freeswitch/conf/lang/fr/vm/sounds.xml +etc/freeswitch/lang/fr/fr.xml +etc/freeswitch/lang/fr/demo/demo.xml +etc/freeswitch/lang/fr/dir/sounds.xml +etc/freeswitch/lang/fr/dir/tts.xml +etc/freeswitch/lang/fr/vm/sounds.xml diff --git a/debian/freeswitch-lang-fr.install b/debian/freeswitch-lang-fr.install index 141084eac..4d84b8136 100644 --- a/debian/freeswitch-lang-fr.install +++ b/debian/freeswitch-lang-fr.install @@ -1,6 +1,6 @@ -opt/freeswitch/conf/lang/fr/fr.xml -opt/freeswitch/conf/lang/fr/demo/demo.xml -opt/freeswitch/conf/lang/fr/dir/sounds.xml -opt/freeswitch/conf/lang/fr/dir/tts.xml -opt/freeswitch/conf/lang/fr/vm/sounds.xml -opt/freeswitch/mod/mod_say_fr.so* +etc/freeswitch/lang/fr/fr.xml +etc/freeswitch/lang/fr/demo/demo.xml +etc/freeswitch/lang/fr/dir/sounds.xml +etc/freeswitch/lang/fr/dir/tts.xml +etc/freeswitch/lang/fr/vm/sounds.xml +usr/lib/freeswitch/mod/mod_say_fr.so* From 746a12bd243b0032b832e8b89b443ed7cf281c64 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:31:56 +0100 Subject: [PATCH 14/32] Update freeswitch-lang-he package files to the new tree hierarchy --- debian/freeswitch-lang-he.conffiles | 10 +++++----- debian/freeswitch-lang-he.install | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/debian/freeswitch-lang-he.conffiles b/debian/freeswitch-lang-he.conffiles index 37ec6015d..c21adf183 100644 --- a/debian/freeswitch-lang-he.conffiles +++ b/debian/freeswitch-lang-he.conffiles @@ -1,5 +1,5 @@ -/opt/freeswitch/conf/lang/he/demo/demo-ivr.xml -/opt/freeswitch/conf/lang/he/demo/demo.xml -/opt/freeswitch/conf/lang/he/dir/sounds.xml -/opt/freeswitch/conf/lang/he/he.xml -/opt/freeswitch/conf/lang/he/vm/sounds.xml +etc/freeswitch/lang/he/demo/demo-ivr.xml +etc/freeswitch/lang/he/demo/demo.xml +etc/freeswitch/lang/he/dir/sounds.xml +etc/freeswitch/lang/he/he.xml +etc/freeswitch/lang/he/vm/sounds.xml diff --git a/debian/freeswitch-lang-he.install b/debian/freeswitch-lang-he.install index ed0c65813..2b73d7397 100644 --- a/debian/freeswitch-lang-he.install +++ b/debian/freeswitch-lang-he.install @@ -1,6 +1,6 @@ -opt/freeswitch/conf/lang/he/demo/demo-ivr.xml -opt/freeswitch/conf/lang/he/demo/demo.xml -opt/freeswitch/conf/lang/he/dir/sounds.xml -opt/freeswitch/conf/lang/he/he.xml -opt/freeswitch/conf/lang/he/vm/sounds.xml -opt/freeswitch/mod/mod_say_he.so* +etc/freeswitch/lang/he/demo/demo-ivr.xml +etc/freeswitch/lang/he/demo/demo.xml +etc/freeswitch/lang/he/dir/sounds.xml +etc/freeswitch/lang/he/he.xml +etc/freeswitch/lang/he/vm/sounds.xml +usr/lib/freeswitch/mod/mod_say_he.so* From 0363a95312565b493b6a9c431b7f92b8fd9b2806 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:33:54 +0100 Subject: [PATCH 15/32] Update freeswitch-lang-it package files to the new tree hierarchy --- debian/freeswitch-lang-it.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/freeswitch-lang-it.install b/debian/freeswitch-lang-it.install index 37a08020c..573b79855 100644 --- a/debian/freeswitch-lang-it.install +++ b/debian/freeswitch-lang-it.install @@ -1 +1 @@ -opt/freeswitch/mod/mod_say_it.so* +usr/lib/freeswitch/mod/mod_say_it.so* From f4eb4d469263a01de3e86bba608142ae357d94d7 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:34:55 +0100 Subject: [PATCH 16/32] Update freeswitch-lang-nl package files to the new tree hierarchy --- debian/freeswitch-lang-nl.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/freeswitch-lang-nl.install b/debian/freeswitch-lang-nl.install index 061a87e46..05da3c3a1 100644 --- a/debian/freeswitch-lang-nl.install +++ b/debian/freeswitch-lang-nl.install @@ -1 +1 @@ -opt/freeswitch/mod/mod_say_nl.so* +usr/lib/freeswitch/mod/mod_say_nl.so* From 60d25b860ab66fd24a6271272c402502327e01a5 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:37:49 +0100 Subject: [PATCH 17/32] Update freeswitch-lang-ru package files to the new tree hierarchy --- debian/freeswitch-lang-ru.conffiles | 14 +++++++------- debian/freeswitch-lang-ru.install | 16 ++++++++-------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/debian/freeswitch-lang-ru.conffiles b/debian/freeswitch-lang-ru.conffiles index 55e97079d..c5582e530 100644 --- a/debian/freeswitch-lang-ru.conffiles +++ b/debian/freeswitch-lang-ru.conffiles @@ -1,7 +1,7 @@ -/opt/freeswitch/conf/lang/ru/demo/demo-ivr.xml -/opt/freeswitch/conf/lang/ru/demo/demo.xml -/opt/freeswitch/conf/lang/ru/dir/sounds.xml -/opt/freeswitch/conf/lang/ru/dir/tts.xml -/opt/freeswitch/conf/lang/ru/ru.xml -/opt/freeswitch/conf/lang/ru/vm/sounds.xml -/opt/freeswitch/conf/lang/ru/vm/tts.xml +etc/freeswitch/lang/ru/demo/demo-ivr.xml +etc/freeswitch/lang/ru/demo/demo.xml +etc/freeswitch/lang/ru/dir/sounds.xml +etc/freeswitch/lang/ru/dir/tts.xml +etc/freeswitch/lang/ru/ru.xml +etc/freeswitch/lang/ru/vm/sounds.xml +etc/freeswitch/lang/ru/vm/tts.xml diff --git a/debian/freeswitch-lang-ru.install b/debian/freeswitch-lang-ru.install index 7c58f72f1..c0f9f221d 100644 --- a/debian/freeswitch-lang-ru.install +++ b/debian/freeswitch-lang-ru.install @@ -1,8 +1,8 @@ -opt/freeswitch/conf/lang/ru/demo/demo-ivr.xml -opt/freeswitch/conf/lang/ru/demo/demo.xml -opt/freeswitch/conf/lang/ru/dir/sounds.xml -opt/freeswitch/conf/lang/ru/dir/tts.xml -opt/freeswitch/conf/lang/ru/ru.xml -opt/freeswitch/conf/lang/ru/vm/sounds.xml -opt/freeswitch/conf/lang/ru/vm/tts.xml -opt/freeswitch/mod/mod_say_ru.so* +etc/freeswitch/lang/ru/demo/demo-ivr.xml +etc/freeswitch/lang/ru/demo/demo.xml +etc/freeswitch/lang/ru/dir/sounds.xml +etc/freeswitch/lang/ru/dir/tts.xml +etc/freeswitch/lang/ru/ru.xml +etc/freeswitch/lang/ru/vm/sounds.xml +etc/freeswitch/lang/ru/vm/tts.xml +usr/lib/freeswitch/mod/mod_say_ru.so* From 5afd73b5516c6be3c9963c34b5b4df24af865c7d Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:38:30 +0100 Subject: [PATCH 18/32] Update freeswitch-lua package files to the new tree hierarchy --- debian/freeswitch-lua.conffiles | 2 +- debian/freeswitch-lua.install | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/freeswitch-lua.conffiles b/debian/freeswitch-lua.conffiles index dbe8a22a9..7c3ca38e6 100644 --- a/debian/freeswitch-lua.conffiles +++ b/debian/freeswitch-lua.conffiles @@ -1 +1 @@ -/opt/freeswitch/conf/autoload_configs/lua.conf.xml +etc/freeswitch/autoload_configs/lua.conf.xml diff --git a/debian/freeswitch-lua.install b/debian/freeswitch-lua.install index af944aebe..0aca1bf8e 100644 --- a/debian/freeswitch-lua.install +++ b/debian/freeswitch-lua.install @@ -1,2 +1,2 @@ -opt/freeswitch/conf/autoload_configs/lua.conf.xml -opt/freeswitch/mod/mod_lua.so* +etc/freeswitch/autoload_configs/lua.conf.xml +usr/lib/freeswitch/mod/mod_lua.so* From 5fc8a8643977b5404ebf920d98325f002cc2f4c5 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:40:57 +0100 Subject: [PATCH 19/32] Update freeswitch-perl package files to the new tree hierarchy --- debian/freeswitch-perl.conffiles | 2 +- debian/freeswitch-perl.install | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/freeswitch-perl.conffiles b/debian/freeswitch-perl.conffiles index 6a1381999..5d069db7e 100644 --- a/debian/freeswitch-perl.conffiles +++ b/debian/freeswitch-perl.conffiles @@ -1 +1 @@ -/opt/freeswitch/conf/autoload_configs/perl.conf.xml +etc/freeswitch/autoload_configs/perl.conf.xml diff --git a/debian/freeswitch-perl.install b/debian/freeswitch-perl.install index 706a6a091..2b76083b1 100644 --- a/debian/freeswitch-perl.install +++ b/debian/freeswitch-perl.install @@ -1,3 +1,3 @@ -opt/freeswitch/conf/autoload_configs/perl.conf.xml -opt/freeswitch/mod/mod_perl.so* -opt/freeswitch/perl/* +etc/freeswitch/autoload_configs/perl.conf.xml +usr/lib/freeswitch/mod/mod_perl.so* +usr/share/freeswitch/perl/* From 81707111a57fd1d5c14a6c8445749ac20d1d7037 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:45:14 +0100 Subject: [PATCH 20/32] Update freeswitch-python package files to the new tree hierarchy --- debian/freeswitch-python.conffiles | 2 +- debian/freeswitch-python.install | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/freeswitch-python.conffiles b/debian/freeswitch-python.conffiles index 1c1746c87..4b87ffc6c 100644 --- a/debian/freeswitch-python.conffiles +++ b/debian/freeswitch-python.conffiles @@ -1 +1 @@ -opt/freeswitch/conf/autoload_configs/python.conf.xml +etc/freeswitch/autoload_configs/python.conf.xml diff --git a/debian/freeswitch-python.install b/debian/freeswitch-python.install index 247c26d67..014f38a43 100644 --- a/debian/freeswitch-python.install +++ b/debian/freeswitch-python.install @@ -1,5 +1,5 @@ -opt/freeswitch/conf/autoload_configs/python.conf.xml -opt/freeswitch/mod/mod_python.so* +etc/freeswitch/autoload_configs/python.conf.xml +usr/lib/freeswitch/mod/mod_python.so* usr/lib/python2.*/*-packages/freeswitch.py* usr/lib/python2.*/*-packages/ESL.py* usr/lib/python2.*/*-packages/_ESL.so* From 74df1bb0d861c7e160d602df40ec288bbd462386 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Fri, 16 Mar 2012 21:45:41 +0100 Subject: [PATCH 21/32] Update freeswitch-spidermonkey package files to the new tree hierarchy --- debian/freeswitch-spidermonkey.conffiles | 2 +- debian/freeswitch-spidermonkey.install | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/freeswitch-spidermonkey.conffiles b/debian/freeswitch-spidermonkey.conffiles index 2a8eeb06f..071de70af 100644 --- a/debian/freeswitch-spidermonkey.conffiles +++ b/debian/freeswitch-spidermonkey.conffiles @@ -1 +1 @@ -/opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml +etc/freeswitch/autoload_configs/spidermonkey.conf.xml diff --git a/debian/freeswitch-spidermonkey.install b/debian/freeswitch-spidermonkey.install index 882a287ba..29bbf95a6 100644 --- a/debian/freeswitch-spidermonkey.install +++ b/debian/freeswitch-spidermonkey.install @@ -1,6 +1,6 @@ -opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml -opt/freeswitch/lib/libjs.so* -opt/freeswitch/lib/libnspr4.so* -opt/freeswitch/lib/libplc4.so* -opt/freeswitch/lib/libplds4.so* -opt/freeswitch/mod/mod_spidermonkey*.so* +etc/freeswitch/autoload_configs/spidermonkey.conf.xml +usr/lib/freeswitch/libjs.so* +usr/lib/freeswitch/libnspr4.so* +usr/lib/freeswitch/libplc4.so* +usr/lib/freeswitch/libplds4.so* +usr/lib/freeswitch/mod/mod_spidermonkey*.so* From 0a81d249dac3b98ceefb1acaa89b656c52cf7f10 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Sun, 18 Mar 2012 16:07:04 +0100 Subject: [PATCH 22/32] Redo post install and post remove to the new tree requiriments --- debian/postinst | 41 ++++++++++++++--------------------------- debian/postrm | 23 ++++++++--------------- 2 files changed, 22 insertions(+), 42 deletions(-) diff --git a/debian/postinst b/debian/postinst index 696171eb5..d1c83080c 100755 --- a/debian/postinst +++ b/debian/postinst @@ -22,34 +22,21 @@ case "$1" in configure) if ! getent passwd freeswitch >/dev/null; then - adduser --disabled-password --quiet --system \ - --home /opt/freeswitch \ - --gecos "FreeSWITCH Voice Platform" --ingroup daemon \ - freeswitch - adduser freeswitch audio - else - if [ "$(getent passwd freeswitch | cut -d : -f 6)" != "/opt/freeswitch" ]; then - echo "Error: pre-existing freeswitch user with non-standard home directory." >&2 - exit 1 - fi - usermod -d /opt/freeswitch -c "FreeSWITCH daemon,,," \ - -g daemon -G audio freeswitch + adduser --disabled-password --quiet --system --no-create-home --gecos "FreeSWITCH Voice Platform" --ingroup daemon freeswitch + else + usermod -c "FreeSWITCH daemon,,," -g daemon -G audio freeswitch fi - - mkdir -p /opt/freeswitch - chown -R freeswitch:daemon /opt/freeswitch/ - chmod -R o-rwx /opt/freeswitch/ - - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; + # Chown vital dirs + mkdir -p /var/{run,spool,log}/freeswitch + chown -R freeswitch /var/{run,spool,log}/freeswitch + chown -R freeswitch /etc/freeswitch + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; esac # dh_installdeb will replace this with shell code automatically diff --git a/debian/postrm b/debian/postrm index 97718dfac..cc7a8fdf5 100755 --- a/debian/postrm +++ b/debian/postrm @@ -19,21 +19,14 @@ case "$1" in - purge) - rm -Rf /etc/opt/freeswitch - rm -Rf /opt/freeswitch - userdel freeswitch - ;; - - remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - + purge) + userdel freeswitch + ;; + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 esac # dh_installdeb will replace this with shell code automatically From 4dc8011fe3ffb9d0b04336a3e5a0b44fb7a1910d Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Sun, 18 Mar 2012 17:24:54 +0100 Subject: [PATCH 23/32] Change dh_fixperms to exclude the new config files directory --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 53ede31b5..a0cd7de9d 100755 --- a/debian/rules +++ b/debian/rules @@ -244,7 +244,7 @@ binary-arch: build install dh_link dh_strip --dbg-package=freeswitch-dbg dh_compress - dh_fixperms --exclude /opt/freeswitch/conf + dh_fixperms --exclude /etc/freeswitch dh_makeshlibs dh_shlibdeps dh_installdeb From d3f849d793ac48cb2c28366cf38e9ae1ba6dae1d Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Mon, 19 Mar 2012 13:00:07 +0100 Subject: [PATCH 24/32] Create README files, adding me as maintainer --- debian/README.Debian | 77 ++++++++++++++++++++ debian/README.source | 8 ++ debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE | 29 -------- debian/control | 2 +- 4 files changed, 86 insertions(+), 30 deletions(-) create mode 100644 debian/README.Debian create mode 100644 debian/README.source delete mode 100644 debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 000000000..29688bf52 --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,77 @@ +Freeswitch for Debian +--------------------- + +Buillt with the following features: + - ODBC support + - Libedit support + - Openssl + - Curl + +The following modules are built-in + - mod_avmd + - mod_avmd + - mod_callcenter + - mod_cdr_csv + - mod_celt.so* + - mod_cidlookup + - mod_cluechoo + - mod_console + - mod_codec2 + - mod_commands + - mod_conference + - mod_console + - mod_curl + - mod_db + - mod_dialplan + - mod_dingaling + - mod_directory + - mod_distributor + - mod_dptools + - mod_easyroute + - mod_enum + - mod_esf + - mod_event + - mod_expr + - mod_fifo + - mod_flite + - mod_fsv + - mod_hash + - mod_h26x + - mod_ilbc + - mod_lcr + - mod_limit + - mod_local_stream + - mod_logfile + - mod_loopback + - mod_memcache + - mod_mp4v + - mod_native_file + - mod_nibblebill + - mod_portaudio + - mod_portaudio_stream + - mod_redis + - mod_rss + - mod_shout + - mod_silk + - mod_siren + - mod_skinny + - mod_skypopen + - mod_sndfile + - mod_snom + - mod_cdr_sqlite + - mod_sofia + - mod_spandsp + - mod_speex + - mod_spy + - mod_syslog + - mod_theora + - mod_timerfd + - mod_tone_stream + - mod_tts_commandline + - mod_valet_parking + - mod_vmd + - mod_voicemail + - mod_xml + + + -- Alfredo Palhares Thu, 19 Mar 2012 11:06:21 +0000 diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 000000000..1c5c6167c --- /dev/null +++ b/debian/README.source @@ -0,0 +1,8 @@ +Freeswitch for Debian +--------------------- + +- Building from upstream + + When building from upstream you should bump the version to the date of the + last commit in the control file and you run rules upstream-convert that renames + the folder and creates a orig file. diff --git a/debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE b/debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE deleted file mode 100644 index 17480db19..000000000 --- a/debian/READ_BEFORE_CHANGING_ANYTHING_IN_HERE +++ /dev/null @@ -1,29 +0,0 @@ -Please do not change the maintainer (as found in the control file). - -Please DO send me a note before changing anything here. Also, PLEASE DO MAKE A -JIRA FIRST !!!! - -This request is the result of far too many sleepless nights and far too many -people breaking this far too often. So, HANDS OFF FOR NOW !!!! - -Again, to be perfectly clear: -1. Do not make any changes before verifying that they are OK with the current -maintainer (yes, that is me*). - -2. Before the mere idea of making a change crosses your mind, create a ticket in -Jira and assign it to the current maintainer. - -3. As current maintainer, I have other obligations besides fixing things people -break in the Debian build. So, please be patient; it can sometimes take a -bit for me to respond. - -4. Creating and maintaining this packages has been a lot of work. Please help -me maintain it by not fixing it to death. - -5. The maintainer is always right. - -6. If you believe the maintainer is wrong, please see item #5. - - - -* Michal Bielicki diff --git a/debian/control b/debian/control index 193833700..3c362ae33 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: freeswitch Section: comm Priority: extra Maintainer: FreeSWITCH developers -Uploaders: Michal Bielicki , Gabriel Gunderson , William King , Mathieu Parent +Uploaders: Michal Bielicki , Gabriel Gunderson , William King , Mathieu Parent , Alfredo Palhares Build-Depends: debhelper (>= 7), wget, automake (>=1.9), autoconf, libtool, unixodbc-dev, libasound2-dev, libcurl3-openssl-dev|libcurl4-openssl-dev, libssl-dev, ncurses-dev, libogg-dev, libvorbis-dev, libperl-dev, libgdbm-dev, From f20f6ad42eb0e1cafcacb5a45974a07dc9cc86ca Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Wed, 21 Mar 2012 01:53:19 +0100 Subject: [PATCH 25/32] Change rundir in the configure section --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index a0cd7de9d..91b21346d 100755 --- a/debian/rules +++ b/debian/rules @@ -188,7 +188,7 @@ config.status: configure --with-pkgconfigdir=/usr/lib/pkgconfig \ --with-logfiledir=/var/log/freeswitch \ --with-modinstdir=/usr/lib/freeswitch/mod \ - --with-rundir=/run/freeswitch \ + --with-rundir=/var/run/freeswitch \ --prefix=/usr/share/freeswitch \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} From 0502bb058b7277a7e104521ece6ef77d300cd814 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Wed, 21 Mar 2012 01:56:41 +0100 Subject: [PATCH 26/32] Add new init script that works --- debian/freeswitch.init | 161 ++++++++++++++++++----------------------- 1 file changed, 70 insertions(+), 91 deletions(-) diff --git a/debian/freeswitch.init b/debian/freeswitch.init index c09e7128d..cc6ce68fc 100755 --- a/debian/freeswitch.init +++ b/debian/freeswitch.init @@ -9,38 +9,32 @@ # Description: An advanced platform for voice services ### END INIT INFO -# Author: Anthony Minesalle II -# +# Author: Alfredo Palhares # Do NOT "set -e" # PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH=/sbin:/usr/sbin:/bin:/usr/bin:/opt/freeswitch/bin +PATH=/sbin:/usr/sbin:/bin:/usr/bin DESC="FreeSWITCH Voice Switching System" NAME=freeswitch -DAEMON=/opt/freeswitch/bin/$NAME +DAEMON=/usr/bin/$NAME USER=freeswitch -PIDFILE=/opt/freeswitch/run/$NAME.pid +GROUP=daemon +PIDFILE=/var/run/$NAME/$NAME.pid +RUNDIR=/var/run/freeswitch SCRIPTNAME=/etc/init.d/$NAME -WORKDIR=/opt/$NAME - -# Check if we are being executed by init -CALLEDSCRIPT=`basename $0` -if [ -r /etc/default/$NAME ]; then . /etc/default/$NAME; fi +# Read configuration variable file if it is present +if [ -r /etc/default/$NAME ]; then + . /etc/default/$NAME +fi if [ "$FREESWITCH_ENABLED" != "true" ]; then - echo "$DESC not enabled yet. Edit /etc/default/$NAME first." - exit 0 ; + echo "$DESC not enabled yet. Edit /etc/default/$NAME first." + exit 0 fi -# Exit if the package is not installed -# [ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - # Load the VERBOSE setting and other rcS variables . /lib/init/vars.sh @@ -52,18 +46,14 @@ fi # Function that sets ulimit values for the daemon # do_setlimits() { - ulimit -c unlimited - ulimit -d unlimited - ulimit -f unlimited -# ulimit -i unlimited - ulimit -n 999999 -# ulimit -q unlimited -# ulimit -u unlimited - ulimit -v unlimited -# ulimit -x unlimited - ulimit -s 240 - ulimit -l unlimited - return 0 + ulimit -c unlimited + ulimit -d unlimited + ulimit -f unlimited + ulimit -n 999999 + ulimit -v unlimited + ulimit -s 240 + ulimit -l unlimited + return 0 } # @@ -71,19 +61,15 @@ do_setlimits() { # do_start() { + # Return # 0 if daemon has been started # 1 if daemon was already running # 2 if daemon could not be started - start-stop-daemon -d $WORKDIR -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ - || return 1 + start-stop-daemon --quiet --start --pidfile $PIDFILE --exec $DAEMON --test || return 1 do_setlimits - start-stop-daemon -d $WORKDIR -c $USER --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ - $FREESWITCH_PARAMS \ - || return 2 - # Add code here, if necessary, that waits for the process to be ready - # to handle requests from services started subsequently which depend - # on this one. As a last resort, sleep for some time. + start-stop-daemon --quiet --start --pidfile $PIDFILE --exec $DAEMON -- -u $USER -g $GROUP $FREESWITCH_PARAMS || return 1 + return 0 } # @@ -97,16 +83,12 @@ do_stop() # 2 if daemon could not be stopped # other if a failure occurred $DAEMON -stop - start-stop-daemon -d $WORKDIR -c $USER --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + start-stop-daemon --stop --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME RETVAL="$?" [ "$RETVAL" = 2 ] && return 2 # Wait for children to finish too if this is a daemon that forks # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - start-stop-daemon -d $WORKDIR -c $USER --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + start-stop-daemon -c $USER --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON [ "$?" = 2 ] && return 2 # Many daemons don't delete their pidfiles when they exit. rm -f $PIDFILE @@ -117,68 +99,65 @@ do_stop() # Function that sends a SIGHUP to the daemon/service # do_reload() { - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # start-stop-daemon -c $USER --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME return 0 } case "$1" in start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac + log_daemon_msg "Starting $DESC \n" + do_start + case "$?" in + 0|1) + log_end_msg 0 + ;; + 2) + log_end_msg 1 + ;; + esac ;; stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac + log_daemon_msg "Stopping $DESC \n" + do_stop + case "$?" in + 0|1) + log_end_msg 0 + ;; + 2) + log_end_msg 1 + ;; + esac ;; reload|force-reload) - # - # If do_reload() is not implemented then leave this commented out - # and leave 'force-reload' as an alias for 'restart'. - # - log_daemon_msg "Reloading $DESC" "$NAME" - do_reload - log_end_msg $? - ;; + log_daemon_msg "Reloading $DESC \n" + do_reload + log_end_msg $? + ;; restart) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac + log_daemon_msg "Restarting $DESC \n" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) + log_end_msg 0 + ;; + 1) + log_end_msg 1 + ;; + *) + log_end_msg 1 + ;; + esac ;; *) - # Failed to stop - log_end_msg 1 + log_end_msg 1 ;; - esac + esac ;; *) - echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - #echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 3 + echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + exit 3 ;; esac - -: From 53e40573758d1c9a869f509756aaa9b30173b0f5 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Wed, 21 Mar 2012 02:00:39 +0100 Subject: [PATCH 27/32] Enable freeswitch init start by default --- debian/freeswitch.default | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/freeswitch.default b/debian/freeswitch.default index df94d7f0d..aa197c667 100644 --- a/debian/freeswitch.default +++ b/debian/freeswitch.default @@ -3,9 +3,8 @@ # Enable initd (let init handle start and stop of freeswitch). # Set to "true" (lowercase) to enable. -FREESWITCH_ENABLED="false" +FREESWITCH_ENABLED="true" # The parameters Freeswitch should be started with FREESWITCH_PARAMS="-nc" - From 0cdb678c8ed06d09278b43fb7e882206cec5b2bc Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Wed, 21 Mar 2012 02:03:49 +0100 Subject: [PATCH 28/32] Information that the daemon starts under freeswitch user --- debian/README.Debian | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/README.Debian b/debian/README.Debian index 29688bf52..3cea74697 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,6 +1,8 @@ Freeswitch for Debian --------------------- +It starts under a non-priviliged freeswitch user for safety. + Buillt with the following features: - ODBC support - Libedit support @@ -73,5 +75,4 @@ The following modules are built-in - mod_voicemail - mod_xml - -- Alfredo Palhares Thu, 19 Mar 2012 11:06:21 +0000 From a16864365ac08b8c355ed43d3d97f08e336abf48 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Wed, 21 Mar 2012 02:13:55 +0100 Subject: [PATCH 29/32] Add things to do and warnings --- debian/TODO | 8 ++++++++ debian/freeswitch.default | 1 + debian/freeswitch.init | 2 ++ 3 files changed, 11 insertions(+) create mode 100644 debian/TODO diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 000000000..842b55934 --- /dev/null +++ b/debian/TODO @@ -0,0 +1,8 @@ +TODO +---- + +BUG: Init script - -ncwait option is not working sometimes, unknown reason. +BUG: Init script - reload option is not working properly. +Init script - add status function. +Remove the debian/ directory from the upstream tree. +Add debian/watch to get code from upstream and tame it. diff --git a/debian/freeswitch.default b/debian/freeswitch.default index aa197c667..d1e5b2d1d 100644 --- a/debian/freeswitch.default +++ b/debian/freeswitch.default @@ -7,4 +7,5 @@ FREESWITCH_ENABLED="true" # The parameters Freeswitch should be started with +# WARNING: -ncwait option is not working at the moment! Use at your own risk! FREESWITCH_PARAMS="-nc" diff --git a/debian/freeswitch.init b/debian/freeswitch.init index cc6ce68fc..2b913d7e2 100755 --- a/debian/freeswitch.init +++ b/debian/freeswitch.init @@ -98,6 +98,7 @@ do_stop() # # Function that sends a SIGHUP to the daemon/service # +# FIXME: This is not working properly do_reload() { start-stop-daemon -c $USER --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME return 0 @@ -156,6 +157,7 @@ case "$1" in ;; esac ;; + # TODO: Add status option *) echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 exit 3 From cced190ae2fec4d71b73604afb0132729d939e52 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Mon, 19 Mar 2012 22:16:23 +0100 Subject: [PATCH 30/32] Update changelog --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index abfe17e08..49cd24de4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +freeswitch (1.0.head-git.master.20120319.1-1) unstable; urgency=low + + * New install tree, debian policy compatible. + * New init script + * Added a README + * Added a TODO + + -- Alfredo Palhares Mon, 19 May 2012 21:13:22 +0000 + freeswitch (1.0.head-git.master.20110530.1-1) unstable; urgency=low * added mod_cdr_sqlite From 386d4ba4c5a43b2d58879a1ef18b5208d5ac31f8 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Wed, 28 Mar 2012 14:38:11 +0200 Subject: [PATCH 31/32] New LSB compliant init script --- debian/freeswitch.init | 176 +++++++++++++++++++++++------------------ 1 file changed, 101 insertions(+), 75 deletions(-) diff --git a/debian/freeswitch.init b/debian/freeswitch.init index 2b913d7e2..fcac86f44 100755 --- a/debian/freeswitch.init +++ b/debian/freeswitch.init @@ -1,4 +1,5 @@ -#! /bin/sh +#! /bin/bash + ### BEGIN INIT INFO # Provides: freeswitch # Required-Start: $network $local_fs $remote_fs @@ -9,9 +10,11 @@ # Description: An advanced platform for voice services ### END INIT INFO -# Author: Alfredo Palhares - # Do NOT "set -e" +# Before editing read +# http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html + +# Author: Alfredo Palhares # PATH should only include /usr/* if it runs after the mountnfs.sh script PATH=/sbin:/usr/sbin:/bin:/usr/bin @@ -59,107 +62,130 @@ do_setlimits() { # # Function that starts the daemon/service # -do_start() -{ - - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --quiet --start --pidfile $PIDFILE --exec $DAEMON --test || return 1 - do_setlimits - start-stop-daemon --quiet --start --pidfile $PIDFILE --exec $DAEMON -- -u $USER -g $GROUP $FREESWITCH_PARAMS || return 1 - return 0 +do_start() { + do_status >/dev/null 2>&1; state=$?; + if ((state == 3)); then + do_setlimits + $DAEMON -u $USER -g $GROUP $FREESWITCH_PARAMS + else + echo -e "\r" + log_failure_msg "$DESC is already running" + return 7 + fi + # Wait for freeswitch to fully start + sleep 20 + do_status >/dev/null 2>&1; state=$?; + if ((state == 0)); then + log_success_msg "Done" + return 0 + else + echo -e "\r" + log_warning_msg "$DESC couldn't be started or is taking too long" + return 1 + fi } # # Function that stops the daemon/service # -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - $DAEMON -stop - start-stop-daemon --stop --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - start-stop-daemon -c $USER --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - return "$RETVAL" +do_stop() { + do_status >/dev/null 2>&1; state=$?; + if ((state == 0)); then + do_setlimits + $DAEMON -u $USER -g $GROUP -stop + else + echo -e "\r" + log_failure_msg "$DESC is not running" + return 7 + fi + # Wait for freeswitch to fully stop + sleep 5 + do_status >/dev/null 2>&1; state=$?; + if ((state == 3)); then + log_success_msg "Done" + return 0 + else + echo -e "\r" + log_warning_msg "$DESC couldn't be stoped or is taking too long" + return 1 + fi } # -# Function that sends a SIGHUP to the daemon/service +# Function that reloads the config files # -# FIXME: This is not working properly do_reload() { - start-stop-daemon -c $USER --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME - return 0 + reload=$(fs_cli -x reloadxml 2>&1) + echo -e "\r" + if [[ $reload =~ "Success" ]]; then + log_success_msg "Done" + return 0 + else + log_failure_msg "Error realoading configuration" + return 1 + fi +} + +# +# Function that reloads the config files +# +do_status() { + status=$(fs_cli -x status 2>&1) + # Program is running + if [[ $status =~ UP ]]; then + log_success_msg "$DESC is up" + return 0 + # Program is not running + elif [[ $status =~ ERROR ]]; then + # Program is not running and the PIDFILE exists + if [[ -f $PIDFILE ]]; then + log_failure_msg "$DESC is down and pid file still exists" + return 1 + fi + log_failure_msg "$DESC is down" + return 3 + # Unknown status + else + log_warning_msg "Unknown status of $DESC" + return 4 + fi } case "$1" in start) - log_daemon_msg "Starting $DESC \n" + log_daemon_msg "Starting $DESC" do_start - case "$?" in - 0|1) - log_end_msg 0 - ;; - 2) - log_end_msg 1 - ;; - esac + log_end_msg $? ;; stop) - log_daemon_msg "Stopping $DESC \n" + log_daemon_msg "Stopping $DESC" do_stop - case "$?" in - 0|1) - log_end_msg 0 - ;; - 2) - log_end_msg 1 - ;; - esac + log_end_msg $? ;; reload|force-reload) - log_daemon_msg "Reloading $DESC \n" + log_daemon_msg "Reloading $DESC" do_reload log_end_msg $? ;; restart) - log_daemon_msg "Restarting $DESC \n" + log_daemon_msg "Restarting $DESC" do_stop case "$?" in - 0|1) - do_start - case "$?" in - 0) - log_end_msg 0 - ;; - 1) - log_end_msg 1 - ;; - *) - log_end_msg 1 - ;; - esac - ;; - *) - log_end_msg 1 - ;; + 0|7) + do_start + log_end_msg $? + ;; + 1) + log_end_msg 1 + ;; esac ;; - # TODO: Add status option + status) + do_status + log_end_msg $? + ;; *) echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - exit 3 + exit 2 ;; esac From 855f3dd05d41b585706eccf24b0a5bc8ae1821d8 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Wed, 28 Mar 2012 15:15:56 +0200 Subject: [PATCH 32/32] Set freeswitch user home --- debian/postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/postinst b/debian/postinst index d1c83080c..9790374b1 100755 --- a/debian/postinst +++ b/debian/postinst @@ -22,7 +22,7 @@ case "$1" in configure) if ! getent passwd freeswitch >/dev/null; then - adduser --disabled-password --quiet --system --no-create-home --gecos "FreeSWITCH Voice Platform" --ingroup daemon freeswitch + adduser --disabled-password --quiet --system --home /var/freeswitch --gecos "FreeSWITCH Voice Platform" --ingroup daemon freeswitch else usermod -c "FreeSWITCH daemon,,," -g daemon -G audio freeswitch fi