diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | apache.conf | 26 | ||||
| -rw-r--r-- | debian/changelog | 12 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/sitesummary.install | 1 |
5 files changed, 27 insertions, 18 deletions
@@ -3,9 +3,9 @@ DESTDIR = prefix = /usr sbindir = $(prefix)/sbin datadir = $(prefix)/share -cgibindir = $(libdir)/cgi-bin libdir = $(prefix)/lib pkgdatadir = $(datadir)/sitesummary +cgibindir = $(pkgdatadir)/cgi-bin pkgdir = $(libdir)/sitesummary collectordir = $(libdir)/sitesummary/collect.d perldir = $(datadir)/perl5 @@ -39,7 +39,7 @@ install-server: $(INSTALL) $(SUMMARYSCRIPTS) $(DESTDIR)$(pkgdir)/ $(INSTALL) -d $(DESTDIR)/etc/apache2/sites-available/ - $(INSTALL_DATA) apache.conf $(DESTDIR)/etc/apache2/sites-available/sitesummary + $(INSTALL_DATA) apache.conf $(DESTDIR)/etc/apache2/conf.d/sitesummary $(INSTALL) -o www-data -d $(DESTDIR)$(pkgvardir)/entries $(INSTALL) -o www-data -d $(DESTDIR)$(pkgvardir)/tmpstorage diff --git a/apache.conf b/apache.conf index 18d7fa5..a1a6368 100644 --- a/apache.conf +++ b/apache.conf @@ -1,15 +1,17 @@ # -# New URL site/sitesummary/ listing the current statistics, and -# site/cgi-bin/sitesummary-collector.cgi to receive submissions. +# New URL http://<host>/sitesummary/ listing the current statistics, and +# http://<host>/cgi-bin/sitesummary-collector.cgi to receive submissions. # -NameVirtualHost * -<VirtualHost *> - ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ - <Directory "/usr/lib/cgi-bin"> - AllowOverride None - Options ExecCGI -MultiViews +SymLinksIfOwnerMatch - Order allow,deny - Allow from all - </Directory> -</VirtualHost> +Alias /sitesummary /var/lib/sitesummary/www +ScriptAlias /cgi-bin/sitesummary-collector.cgi /usr/share/sitesummary/cgi-bin/sitesummary-collector.cgi + +<Directory /var/lib/sitesummary/www> + AllowOverride None + Options +SymLinksIfOwnerMatch -MultiViews + + # allow only localhost per default + Order deny,allow + Deny from all + Allow from 127.0.0.1 +</Directory> diff --git a/debian/changelog b/debian/changelog index de17647..439ba65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,21 @@ sitesummary (0.0.6) UNRELEASED; urgency=low + [ Petter Reinholdtsen ] * Let the client recommend cron, as it need it to call in after the initial submission after boot. * Add trivial sitesummary-makewebreport to make a web page with the summary results. * Let the collector store the IP peer info about each entry. Not yet working, as the getpeername() code is broken. - - -- Petter Reinholdtsen <pere@debian.org> Tue, 29 Aug 2006 08:26:35 +0200 + + [ Morten Werner Olsen ] + * Move sitesummary-collector.cgi into /usr/share/sitesummary/cgi-bin/ . + * Rewrite Apache example config and place it in /etc/apache2/conf.d/ + as /etc/apache2/sites-available/ is ment for new virtualhosts (which + is not what we want). + * Add myself as uploader. + + -- Morten Werner Olsen <werner@debian.org> Wed, 30 Aug 2006 23:51:38 +0200 sitesummary (0.0.5) terra; urgency=low diff --git a/debian/control b/debian/control index e37d0a1..a8d5b93 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: sitesummary Section: misc Priority: optional Maintainer: Debian Edu Developers <debian-edu@lists.debian.org> -Uploaders: Petter Reinholdtsen <pere@debian.org> +Uploaders: Petter Reinholdtsen <pere@debian.org>, Morten Werner Olsen <werner@debian.org> Build-Depends: debhelper (>= 4), cdbs Standards-Version: 3.7.2 diff --git a/debian/sitesummary.install b/debian/sitesummary.install index 1223730..597bc6c 100644 --- a/debian/sitesummary.install +++ b/debian/sitesummary.install @@ -1,5 +1,4 @@ debian/tmp/etc/apache2 -debian/tmp/usr/lib/cgi-bin debian/tmp/usr/lib/sitesummary/*-summary debian/tmp/usr/sbin/sitesummary-makewebreport debian/tmp/usr/share/perl5 |