7 files changed, 122 insertions, 11 deletions
diff --git a/debian/control b/debian/control
index fb03ddc82..9d9577cb8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Package: freeside
 Architecture: all
 Pre-Depends: freeside-lib
 # dbconfig-common
-Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, freeside-webui, debconf, cron, openbsd-inetd, tcpd, undersmtpd, ssmtp
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc:Depends}, freeside-webui,
+ debconf, cron, openbsd-inetd, tcpd, undersmtpd, ssmtp
 Description: Billing and trouble ticketing for service providers
  Freeside is a web-based billing, trouble ticketing and network monitoring
  application.  It includes features for ISPs and WISPs, hosting providers and
@@ -21,7 +22,72 @@ Description: Billing and trouble ticketing for service providers
 
 Package: freeside-lib
 Architecture: all
-Depends: gnupg,ghostscript,gsfonts,gzip,latex-xcolor,libbusiness-creditcard-perl,libcache-cache-perl,libcache-simple-timedexpiry-perl,libchart-perl,libclass-container-perl,libclass-data-inheritable-perl,libclass-returnvalue-perl,libcolor-scheme-perl,libcompress-zlib-perl,libconvert-binhex-perl,libcrypt-passwdmd5-perl,libcrypt-ssleay-perl,libcss-squish-perl,libdate-manip-perl,libdbd-mysql-perl,libdbd-pg-perl,libdbi-perl,libdbix-dbschema-perl,libdbix-searchbuilder-perl,libdevel-stacktrace-perl,libdevel-symdump-perl,liberror-perl,libexcel-writer-xlsx-perl,libexception-class-perl,libfile-counterfile-perl,libfile-rsync-perl,libfont-afm-perl,libfreezethaw-perl,libfrontier-rpc-perl,libgd-gd2-perl,libgd-graph-perl,libhtml-format-perl,libhtml-mason-perl,libhtml-parser-perl,libhtml-scrubber-perl,libhtml-tagset-perl,libhtml-tree-perl,libhtml-widgets-selectlayers-perl,libio-stringy-perl,libipc-run-perl,libipc-run3-perl,libipc-sharelite-perl,libjavascript-rpc-perl,libjson-perl,liblingua-en-inflect-perl,liblingua-en-nameparse-perl,liblocale-gettext-perl,liblocale-maketext-fuzzy-perl,liblocale-maketext-lexicon-perl,liblocale-subcountry-perl,liblog-dispatch-perl,libmailtools-perl,libmime-tools-perl,libmodule-versions-report-perl,libnet-daemon-perl,libnet-ping-external-perl,libnet-scp-perl,libnet-ssh-perl,libnet-whois-raw-perl,libnetaddr-ip-perl,libnumber-format-perl,libpam-modules,libpam-runtime,libpaper-utils,libparams-validate-perl,libparse-recdescent-perl,libpg-perl,libregexp-common-perl,libspreadsheet-writeexcel-perl,libstring-approx-perl,libstring-shellquote-perl,libterm-readkey-perl,libtest-inline-perl,libtext-autoformat-perl,libtext-charwidth-perl,libtext-csv-perl,libtext-iconv-perl,libtext-quoted-perl,libtext-reform-perl,libtext-template-perl,libtext-wrapi18n-perl,libtext-wrapper-perl,libtie-ixhash-perl,libtime-duration-perl,libtime-modules-perl,libtimedate-perl,libtree-simple-perl,libuniversal-require-perl,liburi-perl,libwant-perl,libwww-perl,libxml-parser-perl,libyaml-perl,lmodern,locales,lpr,mime-support,ntp,ntpdate,perl,perl-base,perl-modules,postgresql,postgresql-client,psutils,rsync,openssh-client,texlive,texlive-latex-extra,texinfo,ttf-bitstream-vera,fonts-dustin,libdatetime-perl,libdatetime-format-strptime-perl,libfile-slurp-perl,libspreadsheet-parseexcel-perl,libauthen-passphrase-perl,libnet-domain-tld-perl,libbusiness-us-usps-webtools-perl,libxml-simple-perl,libemail-sender-perl,libemail-sender-transport-smtp-tls-perl,libemail-sender-perl,libemail-sender-transport-smtp-tls-perl,libhtml-defang-perl,libdatetime-format-natural-perl,libcgi-pm-perl,libfile-sharedir-perl,libmodule-versions-report-perl,libtext-wikiformat-perl,libnet-server-perl,libhttp-server-simple-perl,libhtml-rewriteattributes-perl,libmime-types-perl,libperlio-eol-perl,libgnupg-interface-perl,libdata-ical-perl,libcalendar-simple-perl,libdatetime-set-perl,libhook-lexwrap-perl,libhttp-server-simple-mason-perl,libxml-rss-perl,libipc-run-safehandles-perl,libpoe-perl,libsoap-lite-perl,libhtml-tableextract-perl,libhtml-element-extended-perl,libcam-pdf-perl,libnet-openssh-perl,libgd-barcode-perl,sam2p,libsys-sigaction-perl,libgeo-googleearth-pluggable-perl,libgeo-coder-googlev3-perl,libnet-snmp-perl,libcrypt-openssl-rsa-perl,libregexp-common-perl,libnet-cidr-perl,libregexp-ipv6-perl,libhtml-quoted-perl,libtext-password-pronounceable-perl,libconvert-color-perl,liburi-perl,libhtml-rewriteattributes-perl,libregexp-common-net-cidr-perl,liblog-dispatch-perl,libdbix-searchbuilder-perl,libencode-perl,libhtml-mason-psgihandler-perl,libdate-simple-perl,libsnmp-perl,libemail-valid-perl,libio-string-perl,libnet-smtp-ssl-perl,libgeo-coder-googlev3-perl,libcam-pdf-perl,libnet-openssh-perl,libhtml-quoted-perl,libregexp-ipv6-perl,libregexp-common-net-cidr-perl,libencode-perl,libexcel-writer-xlsx-perl,libgeo-googleearth-pluggable-perl,libhtml-mason-psgihandler-perl,libdate-simple-perl,libsnmp-perl,libemail-valid-perl,libparse-fixedlength-perl,libregexp-common-net-cidr-perl,libio-string-perl,libnet-mac-vendor-perl,libnet-https-any-perl,libapache2-authcookie-perl,liblocale-currency-format-perl
+Depends: gnupg,ghostscript,gsfonts,gzip,latex-xcolor,
+ libbusiness-creditcard-perl,libcache-cache-perl,
+ libcache-simple-timedexpiry-perl,libchart-perl,libclass-container-perl,
+ libclass-data-inheritable-perl,libclass-returnvalue-perl,libcolor-scheme-perl,
+ libcompress-zlib-perl,libconvert-binhex-perl,libcrypt-passwdmd5-perl,
+ libcrypt-ssleay-perl,libcss-squish-perl,libdate-manip-perl,libdbd-mysql-perl,
+ libdbd-pg-perl,libdbi-perl,libdbix-dbschema-perl,libdbix-searchbuilder-perl,
+ libdevel-stacktrace-perl,libdevel-symdump-perl,liberror-perl,
+ libexcel-writer-xlsx-perl,libexception-class-perl,libfile-counterfile-perl,
+ libfile-rsync-perl,libfont-afm-perl,libfreezethaw-perl,libfrontier-rpc-perl,
+ libgd-gd2-perl,libgd-graph-perl,libhtml-format-perl,libhtml-mason-perl,
+ libhtml-parser-perl,libhtml-scrubber-perl,libhtml-tagset-perl,
+ libhtml-tree-perl,libhtml-widgets-selectlayers-perl,libio-stringy-perl,
+ libipc-run-perl,libipc-run3-perl,libipc-sharelite-perl,libjavascript-rpc-perl,
+ libjson-perl,liblingua-en-inflect-perl,liblingua-en-nameparse-perl,
+ liblocale-gettext-perl,liblocale-maketext-fuzzy-perl,
+ liblocale-maketext-lexicon-perl,liblocale-subcountry-perl,liblog-dispatch-perl,
+ libmailtools-perl (>=2.12), libmime-tools-perl (>= 5.504),
+ libmodule-versions-report-perl,
+ libnet-daemon-perl,libnet-ping-external-perl,libnet-scp-perl,libnet-ssh-perl,
+ libnet-whois-raw-perl,libnetaddr-ip-perl,libnumber-format-perl,libpam-modules,
+ libpam-runtime,libpaper-utils,libparams-validate-perl,libparse-recdescent-perl,
+ libpg-perl,libregexp-common-perl,libspreadsheet-writeexcel-perl,
+ libstring-approx-perl,libstring-shellquote-perl,libterm-readkey-perl,
+ libtest-inline-perl,libtext-autoformat-perl,libtext-charwidth-perl,
+ libtext-csv-perl,libtext-iconv-perl,libtext-quoted-perl (>= 2.07),
+ libtext-reform-perl,
+ libtext-template-perl,libtext-wrapi18n-perl,libtext-wrapper-perl,
+ libtie-ixhash-perl,libtime-duration-perl,libtime-modules-perl,libtimedate-perl,
+ libtree-simple-perl,libuniversal-require-perl,liburi-perl,libwant-perl,
+ libwww-perl,libxml-parser-perl,libyaml-perl,lmodern,locales,lpr,mime-support,
+ ntp,ntpdate,perl,perl-base,perl-modules,postgresql,postgresql-client,psutils,
+ rsync,openssh-client,texlive,texlive-latex-extra,texinfo,ttf-bitstream-vera,
+ fonts-dustin,libdatetime-perl,libdatetime-format-strptime-perl,
+ libfile-slurp-perl,libspreadsheet-parseexcel-perl,libauthen-passphrase-perl,
+ libnet-domain-tld-perl,libbusiness-us-usps-webtools-perl,libxml-simple-perl,
+ libemail-sender-perl,libemail-sender-transport-smtp-tls-perl,
+ libhtml-defang-perl,libdatetime-format-natural-perl,libcgi-pm-perl,
+ libfile-sharedir-perl,libmodule-versions-report-perl,libtext-wikiformat-perl,
+ libnet-server-perl,libhttp-server-simple-perl,libhtml-rewriteattributes-perl,
+ libmime-types-perl,libperlio-eol-perl,libgnupg-interface-perl,
+ libdata-ical-perl,libcalendar-simple-perl,libdatetime-set-perl,
+ libhook-lexwrap-perl,libhttp-server-simple-mason-perl,libxml-rss-perl,
+ libipc-run-safehandles-perl,libpoe-perl,libsoap-lite-perl,
+ libhtml-tableextract-perl,libhtml-element-extended-perl,libcam-pdf-perl,
+ libnet-openssh-perl,libgd-barcode-perl,sam2p,libsys-sigaction-perl,
+ libgeo-googleearth-pluggable-perl,libgeo-coder-googlev3-perl,libnet-snmp-perl,
+ libcrypt-openssl-rsa-perl,libregexp-common-perl,libnet-cidr-perl,
+ libregexp-ipv6-perl,libhtml-quoted-perl,libtext-password-pronounceable-perl,
+ libconvert-color-perl,liburi-perl,libhtml-rewriteattributes-perl,
+ libregexp-common-net-cidr-perl,liblog-dispatch-perl,libdbix-searchbuilder-perl,
+ libencode-perl,
+ libhtml-mason-psgihandler-perl,libdate-simple-perl,libsnmp-perl,
+ libemail-valid-perl,libio-string-perl,libnet-smtp-ssl-perl,
+ libgeo-coder-googlev3-perl,libcam-pdf-perl,libnet-openssh-perl,
+ libhtml-quoted-perl,libregexp-ipv6-perl,libregexp-common-net-cidr-perl,
+ libexcel-writer-xlsx-perl,libgeo-googleearth-pluggable-perl,
+ libhtml-mason-psgihandler-perl,libdate-simple-perl,libsnmp-perl,
+ libparse-fixedlength-perl,libregexp-common-net-cidr-perl,
+ libio-string-perl,libnet-mac-vendor-perl,libnet-https-any-perl,
+ libapache2-authcookie-perl,liblocale-currency-format-perl,
+ libhtml-formattext-withlinks-perl, libemail-address-perl (>= 1.897),
+ libemail-address-list-perl,
+ libsymbol-global-name-perl, libdate-extract-perl, librole-basic-perl,
+ libhtml-formattext-withlinks-andtables-perl, libcrypt-x509-perl,
+ libdata-guid-perl
 Suggests: libbusiness-onlinepayment-perl
 Description: Libraries for Freeside billing and trouble ticketing
  Freeside is a web-based billing and trouble ticketing application.
@@ -31,7 +97,10 @@ Description: Libraries for Freeside billing and trouble ticketing
 
 Package: freeside-webui
 Architecture: all
-Depends: freeside-lib,apache2,apache2-mpm-prefork,apache2-utils,libapache-dbi-perl,libapache2-mod-perl2,libapache2-request-perl,libapache-session-perl,openssl
+Depends: freeside-lib,apache2,apache2-mpm-prefork,apache2-utils,
+ libapache-dbi-perl,libapache2-mod-perl2,libapache2-request-perl,
+ libapache-session-perl,openssl, libcgi-emulate-psgi-perl,
+ libplack-perl (>= 1.0002)
 Conflicts: apache2-mpm-worker
 Description: Web interface for Freeside billing and trouble ticketing
  Freeside is a web-based billing and trouble ticketing application.
@@ -40,16 +109,28 @@ Description: Web interface for Freeside billing and trouble ticketing
 
 Package: freeside-selfservice-lib
 Architecture: all
-Depends: libtext-template-perl,libbusiness-creditcard-perl,libhttp-browserdetect-perl,libhtml-parser-perl,libtie-ixhash-perl,libhtml-widgets-selectlayers-perl,libtimedate-perl,libnumber-format-perl,libsoap-lite-perl,libtext-csv-xs-perl,apache2-suexec-custom,apache2-mpm-worker|apache2-mpm-prefork
+Depends: libtext-template-perl,libbusiness-creditcard-perl,
+ libhttp-browserdetect-perl,libhtml-parser-perl,libtie-ixhash-perl,
+ libhtml-widgets-selectlayers-perl,libtimedate-perl,libnumber-format-perl,
+ libsoap-lite-perl,libtext-csv-xs-perl,apache2-suexec-custom,apache2
 Recommends:
 Description: Self-service portal for Freeside billing and trouble ticketing
  Freeside is a web-based billing and trouble ticketing application.
  .
  This package provides the libraries needed for the self-service portal.
 
+Package: freeside-torrus
+Architecture: all
+Depends: freeside-webui,freeside-lib,rrdtool,librrds-perl,libxml-libxml-perl,
+ libberkeleydb-perl,libtemplate-perl,libproc-daemon-perl,libnet-snmp-perl,
+ libapache-session-perl,libjson-perl,libdbix-abstract-perl,libdbix-sequence-perl
+Recommends:
+Description: Integrated network monitoring and billing
+ Torrus is a network monitoring system (NMS) for discovering and monitoring routers, switches and other network equipment with SNMP.
+
 Package: freeside-selfservice-ui
 Architecture: all
-Depends: freeside-selfservice-lib
+Depends: freeside-selfservice-lib,apache2
 Description: Self-service portal html/cgi filesfor Freeside billing and trouble ticketing
  Freeside is a web-based billing and trouble ticketing application.
  .
@@ -57,9 +138,10 @@ Description: Self-service portal html/cgi filesfor Freeside billing and trouble
 
 Package: freeside-ng-selfservice
 Architecture: all
-Depends:
+Depends: libapache2-mod-php5,php5-xmlrpc,apache2-mpm-prefork
 Recommends:
-Description: Next Generation Self-service portal written in PHP using the XML-RPC API for Freeside billing and trouble ticketing
+Description: Next Generation Self-service portal for Freeside billing and trouble ticketing
  Freeside is a web-based billing and trouble ticketing application.
  .
- This package provides a self-service portal written in PHP using the XML-RPC API.
+ This package provides the next-generation self-service portal.  It is written
+ in PHP and uses the self-service XML-RPC API.
diff --git a/debian/freeside-lib.postinst b/debian/freeside-lib.postinst
new file mode 100644
index 000000000..870ad315f
--- /dev/null
+++ b/debian/freeside-lib.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+texhash /usr/local/share/texmf
+
diff --git a/debian/freeside-ng-selfservice.deb7 b/debian/freeside-ng-selfservice.deb7
new file mode 100644
index 000000000..58f0d3ad3
--- /dev/null
+++ b/debian/freeside-ng-selfservice.deb7
@@ -0,0 +1 @@
+/var/www/ng_selfservice-DIST/freeside.class.php
diff --git a/debian/freeside-ng-selfservice.deb8 b/debian/freeside-ng-selfservice.deb8
new file mode 100644
index 000000000..d6537dda8
--- /dev/null
+++ b/debian/freeside-ng-selfservice.deb8
@@ -0,0 +1 @@
+/var/www/html/ng_selfservice-DIST/freeside.class.php
diff --git a/debian/freeside-torrus.conffiles b/debian/freeside-torrus.conffiles
new file mode 100644
index 000000000..54116b2d1
--- /dev/null
+++ b/debian/freeside-torrus.conffiles
@@ -0,0 +1 @@
+/usr/local/etc/torrus/conf/torrus-siteconfig.pl
diff --git a/debian/freeside-torrus.postinst b/debian/freeside-torrus.postinst
new file mode 100644
index 000000000..5cc8accad
--- /dev/null
+++ b/debian/freeside-torrus.postinst
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+chown freeside.freeside /var/log/torrus
+chown -R freeside.freeside /var/torrus
+mkdir /srv/torrus/; mkdir /srv/torrus/collector_rrd
+chown -R freeside:freeside /srv/torrus/collector_rrd /usr/local/etc/torrus/discovery /usr/local/etc/torrus/xmlconfig/
+torrus clearcache
diff --git a/debian/rules b/debian/rules
index e3476d686..a7f2b72d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,6 +53,7 @@ export INIT_FILE              = $(TMP).init
 export INIT_INSTALL           = /bin/true
 export HTTPD_RESTART          = /bin/true
 export APACHE_CONF           := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo "$(TMP)-webui/etc/apache2/conf-available" || echo "$(TMP)-webui/etc/apache2/conf.d")
+export TORRUS_CONF           := $(shell [ ${APACHE_VERSION} = '2.4' ] && echo "$(TMP)-torrus/etc/apache2/conf-available" || echo "$(TMP)-torrus/etc/apache2/conf.d")
 export FREESIDE_RESTART       = /bin/true
 
 #XXX root?
@@ -77,6 +78,8 @@ export FREESIDE_URL           = http://$(HOSTNAME)/freeside/
 # (but leaving it for now, otherwise can't get RT to put files where we need em)
 export RT_PATH                = $(TMP)/opt/rt3
 
+export TEXMF_PATH             = $(TMP)-lib/usr/local/share/texmf/tex/latex
+
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -166,9 +169,8 @@ install-stamp: build-stamp
 	$(MAKE) -e DESTDIR=$(TMP)-webui install-docs
 	
 	# Install tex
-	install -D -o freeside -m 444 etc/longtable.sty \
-	$(TMP)-lib/usr/local/share/texmf/tex/latex/longtable.sty
-	texhash $(TMP)-lib/usr/local/share/texmf
+	install -d ${TEXMF_PATH}
+	install -o freeside -m 444 etc/*.sty ${TEXMF_PATH}
 
 	# Create Apache configurations
 	install -d $(APACHE_CONF)
@@ -225,6 +227,19 @@ install-stamp: build-stamp
 	install -d ${TMP}-ng-selfservice$(APACHE_DOCUMENT_ROOT)/
 	cp -R ng_selfservice ${TMP}-ng-selfservice$(APACHE_DOCUMENT_ROOT)/ng_selfservice-DIST/
 
+	# Torrus 
+	
+	install -d ${TORRUS_CONF}
+	install -o root -m 755 htetc/freeside-torrus.conf $(TORRUS_CONF)/
+
+	( cd torrus; \
+	torrus_user=freeside var_user=freeside var_group=freeside ./configure; \
+	$(MAKE) -e DESTDIR=${TMP}-torrus/; \
+	$(MAKE) -e DESTDIR=${TMP}-torrus/ install; \
+	perl -p -i -e "\
+	    s'%%%FREESIDE_URL%%%'${FREESIDE_URL}'g;\
+	" ${TMP}-torrus/usr/local/etc/torrus/conf/torrus-siteconfig.pl )
+
 	#RT Config
 
 	( cd rt; \