Merge ~andreserl/maas:drop_apache into maas:master

[Andres Rodriguez]

Drop usage of apache2 as starting from 2.4 it will no longer be supported.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b drop_apache lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c6386e30e1394531ca9c7d7f57f7b04719d450e9

review: Approve

[Blake Rouse (blake-rouse)]

Hurray!!! This made my day!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index d8c0ac4..56e188b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 maas (2.4.0~alpha1-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
+  * debian/*: Drop usage of apache2. It has long been used to maintain
+    backwards compat for 1.x versions of MAAS, but starting from 2.4, it
+    will no longer be supported.
 
  -- Andres Rodriguez <[e-mail]>  Tue, 21 Nov 2017 10:30:54 -0500
 
diff --git a/debian/control b/debian/control
index 383c395..67a6e15 100644
--- a/debian/control
+++ b/debian/control
@@ -68,8 +68,7 @@ Description: MAAS server common files
 
 Package: maas-region-api
 Architecture: all
-Depends: apache2,
-         bind9utils,
+Depends: bind9utils,
          iproute2,
          libjs-angularjs,
          libjs-yui3-full,
diff --git a/debian/maas-region-api.postinst b/debian/maas-region-api.postinst
index 900caa4..7e512c4 100644
--- a/debian/maas-region-api.postinst
+++ b/debian/maas-region-api.postinst
@@ -7,20 +7,6 @@ db_version 2.0
 
 RELEASE=`lsb_release -rs` || RELEASE=""
 
-configure_region_http() {
-    # handle apache configs
-    if [ -e /usr/share/maas/maas-http.conf -a \
-        ! -e /etc/apache2/conf-enabled/maas-http.conf ]; then
-        ln -sf /usr/share/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf
-    fi
-
-    # enable apache modules needed
-    a2enmod proxy_http
-    a2enmod proxy_wstunnel
-    a2enmod expires
-    a2enmod rewrite
-}
-
 configure_logging() {
     # Give appropriate permissions
     if [ ! -f /var/log/maas/regiond.log ]; then
@@ -36,8 +22,6 @@ configure_logging() {
     # destination folder.
     systemctl restart rsyslog >/dev/null 2>&1 || true
 
-    # apache2 log symlinks
-    ln -sf /var/log/apache2 /var/log/maas/
 }
 
 configure_libdir() {
@@ -58,7 +42,6 @@ configure_libdir() {
 maas-region local_config_set
 
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
-    configure_region_http
     configure_logging
     configure_libdir
 
@@ -67,16 +50,8 @@ elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0
     configure_logging
     configure_libdir
 
-    # If upgrading to any later package version, then upgrade db.
-    invoke-rc.d apache2 stop || true
-
-    # make sure maas http config is symlinked
-    configure_region_http
-
 fi
 
-invoke-rc.d apache2 restart || true
-
 db_stop
 
 #DEBHELPER#
diff --git a/debian/maas-region-api.postrm b/debian/maas-region-api.postrm
index a37547b..9739968 100644
--- a/debian/maas-region-api.postrm
+++ b/debian/maas-region-api.postrm
@@ -10,30 +10,11 @@ case "$1" in
     purge)
         # Remove logging files & foldesr
         rm -rf /var/log/maas/regiond.log*
-        rm -rf /var/log/maas/apache2
         rm -rf /var/log/maas/rsyslog
 
         # Remove libgdir related files
         rm -rf /var/lib/maas/media
 
-        case $RELEASE in
-            12.04|12.10|13.04)
-                if [ -h /etc/apache2/conf.d/maas-http.conf ]; then
-                    rm -rf /etc/apache2/conf.d/maas-http.conf
-                fi
-                ;;
-            *)
-                if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then
-                    rm -rf /etc/apache2/conf-enabled/maas-http.conf
-                fi
-                ;;
-        esac
-
-        # Restarting apache2
-        if [ -x /usr/sbin/invoke-rc.d ]; then
-            invoke-rc.d apache2 restart || true
-        fi
-
         # Delete symlink
         if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
             rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
diff --git a/debian/maas-region-api.preinst b/debian/maas-region-api.preinst
index d4d0709..30a8704 100644
--- a/debian/maas-region-api.preinst
+++ b/debian/maas-region-api.preinst
@@ -34,5 +34,13 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
         mv /etc/maas/templates /etc/maas/templates.maas-old
     fi
 
+    if [ -f /etc/apache2/conf-enabled/maas-http.conf ]; then
+        rm -rf /etc/apache2/conf-enabled/maas-http.conf
+    fi
+
+    if [ -d /var/log/maas/apache2 ]; then
+        rm -rf /var/log/maas/apache2
+    fi
+
 fi
 #DEBHELPER#
diff --git a/debian/maas-region-api.prerm b/debian/maas-region-api.prerm
index ea71d9a..0ae7a18 100644
--- a/debian/maas-region-api.prerm
+++ b/debian/maas-region-api.prerm
@@ -5,5 +5,3 @@ set -e
 . /usr/share/debconf/confmodule
 
 #DEBHELPER#
-
-invoke-rc.d apache2 stop || true
diff --git a/debian/maas-region-controller.postinst b/debian/maas-region-controller.postinst
index c698c88..c4d6c28 100644
--- a/debian/maas-region-controller.postinst
+++ b/debian/maas-region-controller.postinst
@@ -144,8 +144,6 @@ elif [ -n "$DEBCONF_RECONFIGURE" ]; then
 
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
     # If upgrading to any later package version, then upgrade db.
-    deb-systemd-invoke restart apache2 || true
-
     # make sure postgresql is running
     restart_postgresql
 
@@ -183,7 +181,6 @@ fi
 
 deb-systemd-invoke enable maas-regiond >/dev/null || true
 deb-systemd-invoke restart maas-regiond >/dev/null || true
-deb-systemd-invoke restart apache2 || true
 
 if [ -f /lib/systemd/system/maas-rackd.service ]; then
     deb-systemd-invoke restart maas-rackd >/dev/null || true
diff --git a/debian/maas-region-controller.prerm b/debian/maas-region-controller.prerm
index b636dd8..a7fbc34 100644
--- a/debian/maas-region-controller.prerm
+++ b/debian/maas-region-controller.prerm
@@ -6,7 +6,6 @@ set -e
 
 #DEBHELPER#
 
-invoke-rc.d apache2 stop || true
 invoke-rc.d maas-regiond stop || true
 
 . /usr/share/dbconfig-common/dpkg/prerm.pgsql