From e37cf0e2186762a12addc6f558550aad8a4dfb29 Mon Sep 17 00:00:00 2001
From: Isaac Connor <iconnor@pseudo.connortechnology.com>
Date: Fri, 23 Oct 2015 16:08:32 -0400
Subject: [PATCH] append /www to docroot for all debian/ubuntu dists

---
 distros/debian/apache.conf                          | 4 ++--
 distros/debian8/apache.conf                         | 4 ++--
 distros/debian_cmake/apache.conf                    | 4 ++--
 distros/ubuntu1204/apache.conf                      | 4 ++--
 distros/ubuntu1504/apache.conf                      | 2 +-
 distros/ubuntu1504_cmake_split_packages/apache.conf | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/distros/debian/apache.conf b/distros/debian/apache.conf
index 92a2b6414..965c67f86 100644
--- a/distros/debian/apache.conf
+++ b/distros/debian/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/debian8/apache.conf b/distros/debian8/apache.conf
index 92a2b6414..965c67f86 100644
--- a/distros/debian8/apache.conf
+++ b/distros/debian8/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/debian_cmake/apache.conf b/distros/debian_cmake/apache.conf
index 92a2b6414..965c67f86 100644
--- a/distros/debian_cmake/apache.conf
+++ b/distros/debian_cmake/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/ubuntu1204/apache.conf b/distros/ubuntu1204/apache.conf
index 92a2b6414..965c67f86 100644
--- a/distros/ubuntu1204/apache.conf
+++ b/distros/ubuntu1204/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/ubuntu1504/apache.conf b/distros/ubuntu1504/apache.conf
index 30a3774ac..965c67f86 100644
--- a/distros/ubuntu1504/apache.conf
+++ b/distros/ubuntu1504/apache.conf
@@ -1,6 +1,6 @@
 Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>
diff --git a/distros/ubuntu1504_cmake_split_packages/apache.conf b/distros/ubuntu1504_cmake_split_packages/apache.conf
index 92a2b6414..965c67f86 100644
--- a/distros/ubuntu1504_cmake_split_packages/apache.conf
+++ b/distros/ubuntu1504_cmake_split_packages/apache.conf
@@ -1,6 +1,6 @@
-Alias /zm /usr/share/zoneminder
+Alias /zm /usr/share/zoneminder/www
 
-<Directory /usr/share/zoneminder>
+<Directory /usr/share/zoneminder/www>
   php_flag register_globals off
   Options Indexes FollowSymLinks
   <IfModule mod_dir.c>