diff --git a/MANIFEST.in b/MANIFEST.in index 65fecc2..1e77ddd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,12 +1,12 @@ recursive-include debian changelog compat control copyright pycompat rules -recursive-include debian *.dirs *.install *.manpages *.init *.docs -recursive-include debian *.apache_conf +recursive-include debian *.dirs *.install *.init *.docs *.manpages +recursive-include debian *.apache2 *.conf *.preinst recursive-include debian/source format recursive-include doc/man *.[1-9] recursive-include radius * recursive-include test *.py multitest recursive-include tls .placeholder README *.crt *.key *.pem recursive-include web * prune debian/tmp prune debian/mediaproxy-* include INSTALL LICENSE MANIFEST.in TODO build_inplace config.ini.sample diff --git a/debian/control b/debian/control index 12b1675..7e43e1a 100644 --- a/debian/control +++ b/debian/control @@ -1,127 +1,128 @@ Source: mediaproxy Section: net Priority: optional Maintainer: Dan Pascu Uploaders: Adrian Georgescu -Build-Depends: debhelper (>= 9), dh-python, python-all-dev (>= 2.7), python-all-dbg (>= 2.7), libnetfilter-conntrack-dev (>= 0.0.89), iptables-dev (>=1.4.3) +Build-Depends: debhelper (>= 9), dh-apache2, dh-python, python-all-dev (>= 2.7), python-all-dbg (>= 2.7), libnetfilter-conntrack-dev (>= 0.0.89), iptables-dev (>=1.4.3) Standards-Version: 3.9.8 Package: mediaproxy-common Architecture: any Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, iptables (>= 1.4.3 ), python-application (>= 1.2.8), python-cjson, python-gnutls (>= 3.0.0), python-twisted-core (>= 2.5.0), python-twisted-names, python-zope.interface Recommends: python-pyrad (>= 1.1), python-sqlobject Description: MediaProxy common files MediaProxy is a distributed far end NAT traversal solution for media streams of SIP calls. MediaProxy has a dispatcher running on the same host with the OpenSIPS proxy and multiple media relays distributed over the network. The media relays work by manipulating conntrack rules in the Linux kernel to create paths that forward the media streams between the 2 SIP user agents participating in the call. Because it avoids to copy stream data from kernel space to user space and back to kernel space like other implementations, MediaProxy can handle much more media streams at a time, limited only to the network interface bandwidth and the Linux kernel network layer processing speed. . MediaProxy features secure encrypted communication between the dispatcher and the relays, advanced accounting capabilities using multiple backends, support for any combination of audio and video streams, realtime statistics, T.38 fax support as well as automatic load balancing and redundancy among the active relays. . This package includes files common to all MediaProxy packages. Package: mediaproxy-common-dbg Architecture: any Priority: extra Section: debug Depends: ${shlibs:Depends}, ${misc:Depends}, mediaproxy-common (= ${binary:Version}) Recommends: python-all-dbg Description: MediaProxy common files MediaProxy is a distributed far end NAT traversal solution for media streams of SIP calls. MediaProxy has a dispatcher running on the same host with the OpenSIPS proxy and multiple media relays distributed over the network. The media relays work by manipulating conntrack rules in the Linux kernel to create paths that forward the media streams between the 2 SIP user agents participating in the call. Because it avoids to copy stream data from kernel space to user space and back to kernel space like other implementations, MediaProxy can handle much more media streams at a time, limited only to the network interface bandwidth and the Linux kernel network layer processing speed. . MediaProxy features secure encrypted communication between the dispatcher and the relays, advanced accounting capabilities using multiple backends, support for any combination of audio and video streams, realtime statistics, T.38 fax support as well as automatic load balancing and redundancy among the active relays. . This package includes files common to all MediaProxy packages. Package: mediaproxy-dispatcher Architecture: all Depends: ${python:Depends}, ${misc:Depends}, mediaproxy-common (>= ${source:Version}), lsb-base Description: MediaProxy dispatcher MediaProxy is a distributed far end NAT traversal solution for media streams of SIP calls. MediaProxy has a dispatcher running on the same host with the OpenSIPS proxy and multiple media relays distributed over the network. The media relays work by manipulating conntrack rules in the Linux kernel to create paths that forward the media streams between the 2 SIP user agents participating in the call. Because it avoids to copy stream data from kernel space to user space and back to kernel space like other implementations, MediaProxy can handle much more media streams at a time, limited only to the network interface bandwidth and the Linux kernel network layer processing speed. . MediaProxy features secure encrypted communication between the dispatcher and the relays, advanced accounting capabilities using multiple backends, support for any combination of audio and video streams, realtime statistics, T.38 fax support as well as automatic load balancing and redundancy among the active relays. . This package provides the MediaProxy dispatcher. Package: mediaproxy-relay Architecture: all Depends: ${python:Depends}, ${misc:Depends}, mediaproxy-common (>= ${source:Version}), lsb-base Description: MediaProxy relay MediaProxy is a distributed far end NAT traversal solution for media streams of SIP calls. MediaProxy has a dispatcher running on the same host with the OpenSIPS proxy and multiple media relays distributed over the network. The media relays work by manipulating conntrack rules in the Linux kernel to create paths that forward the media streams between the 2 SIP user agents participating in the call. Because it avoids to copy stream data from kernel space to user space and back to kernel space like other implementations, MediaProxy can handle much more media streams at a time, limited only to the network interface bandwidth and the Linux kernel network layer processing speed. . MediaProxy features secure encrypted communication between the dispatcher and the relays, advanced accounting capabilities using multiple backends, support for any combination of audio and video streams, realtime statistics, T.38 fax support as well as automatic load balancing and redundancy among the active relays. . This package provides the MediaProxy relay. Package: mediaproxy-web-sessions Architecture: all -Depends: ${misc:Depends}, php5 | php5-cgi +Depends: ${misc:Depends}, libapache2-mod-php | libapache2-mod-php5 +Recommends: apache2 Description: MediaProxy sessions web page MediaProxy is a distributed far end NAT traversal solution for media streams of SIP calls. MediaProxy has a dispatcher running on the same host with the OpenSIPS proxy and multiple media relays distributed over the network. The media relays work by manipulating conntrack rules in the Linux kernel to create paths that forward the media streams between the 2 SIP user agents participating in the call. Because it avoids to copy stream data from kernel space to user space and back to kernel space like other implementations, MediaProxy can handle much more media streams at a time, limited only to the network interface bandwidth and the Linux kernel network layer processing speed. . MediaProxy features secure encrypted communication between the dispatcher and the relays, advanced accounting capabilities using multiple backends, support for any combination of audio and video streams, realtime statistics, T.38 fax support as well as automatic load balancing and redundancy among the active relays. . This package provides a simple web page to display active media sessions. diff --git a/debian/mediaproxy-web-sessions.apache2 b/debian/mediaproxy-web-sessions.apache2 new file mode 100644 index 0000000..5d59b69 --- /dev/null +++ b/debian/mediaproxy-web-sessions.apache2 @@ -0,0 +1 @@ +conf debian/mediaproxy-web-sessions.conf diff --git a/debian/mediaproxy-web-sessions.apache_conf b/debian/mediaproxy-web-sessions.conf similarity index 79% rename from debian/mediaproxy-web-sessions.apache_conf rename to debian/mediaproxy-web-sessions.conf index 3176170..8151a9b 100644 --- a/debian/mediaproxy-web-sessions.apache_conf +++ b/debian/mediaproxy-web-sessions.conf @@ -1,9 +1,8 @@ Alias /mediasessions /usr/share/mediaproxy/web - AllowOverride None Options None + AllowOverride None DirectoryIndex media_sessions.phtml - Order allow,deny - Allow from all + Require all granted diff --git a/debian/mediaproxy-web-sessions.dirs b/debian/mediaproxy-web-sessions.dirs index c2d0309..8e08494 100644 --- a/debian/mediaproxy-web-sessions.dirs +++ b/debian/mediaproxy-web-sessions.dirs @@ -1,3 +1,2 @@ -etc/apache2/conf.d etc/mediaproxy/web usr/share/mediaproxy diff --git a/debian/mediaproxy-web-sessions.install b/debian/mediaproxy-web-sessions.install index 7c0e5d2..f786bf3 100644 --- a/debian/mediaproxy-web-sessions.install +++ b/debian/mediaproxy-web-sessions.install @@ -1,4 +1 @@ -debian/mediaproxy-web-sessions.apache_conf etc/apache2/conf.d/mediaproxy_sessions web usr/share/mediaproxy -web/config/media_sessions.conf.sample etc/mediaproxy/web/media_sessions.conf - diff --git a/debian/mediaproxy-web-sessions.preinst b/debian/mediaproxy-web-sessions.preinst new file mode 100644 index 0000000..849f91b --- /dev/null +++ b/debian/mediaproxy-web-sessions.preinst @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "upgrade" ] && [ -n "$2" ] && dpkg --compare-versions "$2" le-nl "2.6.4~"; then + # we are upgrading from a version that is older than 2.6.4 ($2 is the old version) + test -d /etc/mediaproxy/web/media_sessions.conf && rm -rf /etc/mediaproxy/web/media_sessions.conf || true + rm -rf /etc/apache2/conf.d/mediaproxy_sessions +fi + +#DEBHELPER# diff --git a/debian/rules b/debian/rules index 4408ab9..98905b2 100644 --- a/debian/rules +++ b/debian/rules @@ -1,30 +1,32 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 %: - dh $@ --with python2 + dh $@ --with python2,apache2 override_dh_clean: dh_clean rm -rf build dist MANIFEST override_dh_install: # common install -m 0644 config.ini.sample debian/mediaproxy-common/etc/mediaproxy/config.ini # dispatcher install -D -m 755 media-dispatcher debian/tmp/usr/bin/media-dispatcher sed --in-place 's,/usr/bin/env python,/usr/bin/python,' debian/tmp/usr/bin/media-dispatcher # relay install -D -m 755 media-relay debian/tmp/usr/bin/media-relay sed --in-place 's,/usr/bin/env python,/usr/bin/python,' debian/tmp/usr/bin/media-relay + # web sessions + install -m 0644 web/config/media_sessions.conf.sample debian/mediaproxy-web-sessions/etc/mediaproxy/web/media_sessions.conf # install the debug extensions to -dbg package dh_install "debian/tmp/usr/lib/python*/*-packages/mediaproxy/interfaces/system/*_d.so" -p mediaproxy-common-dbg # Continue with regular dh_install dh_install -X"*_d.so" override_dh_strip: # Stripped symbols go into -dbg package dh_strip --dbg-package=mediaproxy-common-dbg .PHONY: override_dh_clean override_dh_install override_dh_strip