[hamradio-commits] [dump1090-mutability] 143/172: Use dh_apache2 to handle the config file

[Matteo F. Vescovi]

This is an automated email from the git hooks/post-receive script.

mfv pushed a commit to branch master
in repository dump1090-mutability.

commit 21f29cc68c0a6cdc748d6454e6ee5d09a59713d5
Author: Raphael Geissert <atomo64 at gmail.com>
Date:   Sun Apr 3 13:35:31 2016 +0200

    Use dh_apache2 to handle the config file
    
    Also update the config for apache 2.4
---
 debian/apache2/dump1090-mutability.conf | 16 +++++++++++-----
 debian/control                          |  2 +-
 debian/dump1090-mutability.apache2      |  1 +
 debian/rules                            |  2 +-
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/debian/apache2/dump1090-mutability.conf b/debian/apache2/dump1090-mutability.conf
index 91d5951..d56ceba 100644
--- a/debian/apache2/dump1090-mutability.conf
+++ b/debian/apache2/dump1090-mutability.conf
@@ -1,10 +1,16 @@
-Alias /dump1090 /usr/share/dump1090-mutability/public_html
-Alias /dump1090/data /run/dump1090-mutability/data
 
-<Directory /usr/share/dump1090-mutability/public_html/>
+Alias /dump1090/data /run/dump1090-mutability/
+Alias /dump1090 /usr/share/dump1090-mutability/html/
+
+<Directory /usr/share/dump1090-mutability/html/>
 	Options +FollowSymLinks
 	AllowOverride All
-	Order Allow,Deny
-	Allow From All
+	Require all granted
 	DirectoryIndex gmap.html
 </Directory>
+
+<Directory /run/dump1090-mutability/>
+	AllowOverride All
+	Require all granted
+	DirectoryIndex disabled
+</Directory>
diff --git a/debian/control b/debian/control
index 50975ed..698ba46 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: dump1090-mutability
 Section: net
 Priority: optional
 Maintainer: Oliver Jowett <oliver at mutability.co.uk>
-Build-Depends: debhelper(>=8), librtlsdr-dev, libusb-1.0-0-dev, pkg-config
+Build-Depends: debhelper(>=8), librtlsdr-dev, libusb-1.0-0-dev, pkg-config, apache2-dev (>= 2.4.1-1)
 Standards-Version: 3.9.6
 Homepage: https://github.com/mutability/dump1090
 Vcs-Git: https://github.com/mutability/dump1090.git
diff --git a/debian/dump1090-mutability.apache2 b/debian/dump1090-mutability.apache2
new file mode 100644
index 0000000..d50e172
--- /dev/null
+++ b/debian/dump1090-mutability.apache2
@@ -0,0 +1 @@
+conf debian/apache2/dump1090-mutability.conf
diff --git a/debian/rules b/debian/rules
index 46a3aec..68a0db9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,4 +27,4 @@ override_dh_install:
 	cp -a view1090 debian/dump1090-mutability/usr/bin/view1090-mutability
 
 %:
-	dh $@ 
+	dh $@ --with apache2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/dump1090-mutability.git