Merge ~ack/maas:nginx-dep-maas-common into maas:master

[Alberto Donato]

LP:1981560 deb: move nginx dependency to maas-common

[MAAS Lander (maas-lander)]

UNIT TESTS
-b nginx-dep-maas-common lp:~ack/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: d0d964faf59164777b3007af3c4cbcdd7d1ad7c7

review: Approve

[Björn Tillenius (bjornt)]

+1

review: Approve

diff --git a/debian/control b/debian/control
index d0fb357..01078b9 100644
--- a/debian/control
+++ b/debian/control
@@ -58,6 +58,7 @@ Description: "Metal as a Service" is a physical cloud and IPAM
 Package: maas-common
 Architecture: all
 Depends: avahi-utils,
+         nginx-core,
          rsyslog,
          ${misc:Depends},
          ${python3:Depends},
@@ -207,7 +208,6 @@ Depends: avahi-utils,
          maas-common (=${binary:Version}),
          maas-dhcp (=${binary:Version}),
          maas-proxy (= ${binary:Version}),
-         nginx-core,
          chrony,
          pxelinux | syslinux-common (<< 3:6.00~pre4+dfsg-5),
          python3-httplib2,
diff --git a/debian/maas-common.dirs b/debian/maas-common.dirs
index bb9bd08..9249b9e 100644
--- a/debian/maas-common.dirs
+++ b/debian/maas-common.dirs
@@ -1,3 +1,5 @@
-var/log/maas
 var/lib/maas
+var/lib/maas/http
 var/lib/maas/prometheus
+var/log/maas
+var/log/maas/http
diff --git a/debian/maas-common.install b/debian/maas-common.install
index 48e970a..9b25546 100644
--- a/debian/maas-common.install
+++ b/debian/maas-common.install
@@ -1,4 +1,5 @@
 debian/extras/99-maas-common-sudoers etc/sudoers.d
+debian/extras/nginx.conf var/lib/maas/http
 debian/tmp/usr/lib/maas/maas-delete-file
 debian/tmp/usr/lib/maas/maas-write-file
 
diff --git a/debian/maas-common.postinst b/debian/maas-common.postinst
 old mode 100644
 new mode 100755
index 90a6bea..67e9787
--- a/debian/maas-common.postinst
+++ b/debian/maas-common.postinst
@@ -2,6 +2,11 @@
 
 set -e
 
+disable_nginx() {
+    deb-systemd-invoke stop 'nginx.service' >/dev/null || true
+    deb-systemd-helper disable 'nginx.service' >/dev/null || true
+}
+
 configure_logging() {
     # Logging directory (/var/log/maas)
     chown maas:maas /var/log/maas/
@@ -21,6 +26,9 @@ configure_lib_dir() {
     if [ -d /var/lib/maas/gnupg ]; then
         chown -R maas:maas /var/lib/maas/gnupg
     fi
+    if [ -d /var/lib/maas/http ]; then
+        chown -R maas:maas /var/lib/maas/http
+    fi
 }
 
 add_user_group(){
@@ -31,6 +39,7 @@ add_user_group(){
     adduser --quiet --system --group --home "$home" "$user" || true
 }
 
+disable_nginx
 add_user_group
 configure_logging
 configure_lib_dir
diff --git a/debian/maas-common.postrm b/debian/maas-common.postrm
index 3bd62b4..f7202a4 100755
--- a/debian/maas-common.postrm
+++ b/debian/maas-common.postrm
@@ -14,14 +14,21 @@ case "$1" in
         # clean-up /var/log/maas
         rm -f /var/log/maas/maas.log
         rm -rf /var/log/maas/rsyslog
+        rm -rf /var/log/maas/http
         # clean-up /var/lib/maas
         rm -rf /var/lib/maas/gnupg
         rm -f /var/lib/maas/secret
         rm -f /var/lib/maas/maas_id
         rm -rf /var/lib/maas/rsyslog
         rm -f /var/lib/maas/rsyslog.conf
+        rm -rf /var/lib/maas/http
         rm -f /run/lock/maas:*
-
 esac
 
 rm -f /etc/rsyslog.d/99-maas.conf
+
+# MAAS installation disables system nginx so it doesn't
+# prevent MAAS from running our own nginx daemon. As such,
+# on removal, reenable nginx.
+deb-systemd-helper enable 'nginx.service' >/dev/null || true
+deb-systemd-invoke start 'nginx.service' >/dev/null || true
diff --git a/debian/maas-rack-controller.dirs b/debian/maas-rack-controller.dirs
index 3994741..ac910aa 100644
--- a/debian/maas-rack-controller.dirs
+++ b/debian/maas-rack-controller.dirs
@@ -2,7 +2,5 @@ etc/bind/maas
 etc/maas
 var/lib/maas
 var/lib/maas/boot-resources
-var/lib/maas/http
 var/lib/maas/prometheus
 var/log/maas
-var/log/maas/http
diff --git a/debian/maas-rack-controller.install b/debian/maas-rack-controller.install
index a99ef6a..46a3abe 100644
--- a/debian/maas-rack-controller.install
+++ b/debian/maas-rack-controller.install
@@ -9,4 +9,3 @@ debian/extras/99-maas-sudoers etc/sudoers.d
 usr/bin/maas-rack usr/sbin
 usr/bin/rackd usr/sbin
 usr/bin/maas.power usr/sbin
-debian/extras/nginx.conf var/lib/maas/http
diff --git a/debian/maas-rack-controller.postinst b/debian/maas-rack-controller.postinst
 old mode 100644
 new mode 100755
index c99ef59..cbd92cd
--- a/debian/maas-rack-controller.postinst
+++ b/debian/maas-rack-controller.postinst
@@ -50,11 +50,6 @@ configure_libdir() {
     if [ -S /var/lib/maas/dhcpd.sock ]; then
         chown maas:maas /var/lib/maas/dhcpd.sock
     fi
-
-    # Ensure http related files have correct permissions
-    if [ -d /var/lib/maas/http ]; then
-        chown -R maas:maas /var/lib/maas/http
-    fi
 }
 
 extract_cluster_uuid(){
@@ -147,17 +142,11 @@ fix_dns_permissions() {
     fi
 }
 
-disable_nginx() {
-    deb-systemd-invoke stop 'nginx.service' >/dev/null || true
-    deb-systemd-helper disable 'nginx.service' >/dev/null || true
-}
-
 # Unconditionally ensure that there is at least an empty configuration
 # file. This does *not* overwrite any existing configuration.
 maas-rack config
 
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
-    disable_nginx
     configure_logging
     configure_libdir
     configure_maas_url
@@ -184,7 +173,6 @@ elif [ -n "$DEBCONF_RECONFIGURE" ]; then
     configure_shared_secret
 
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
-    disable_nginx
     configure_logging
     configure_libdir
     maas-rack upgrade-cluster
diff --git a/debian/maas-rack-controller.postrm b/debian/maas-rack-controller.postrm
 old mode 100644
 new mode 100755
index 5b6130b..7803a60
--- a/debian/maas-rack-controller.postrm
+++ b/debian/maas-rack-controller.postrm
@@ -42,10 +42,6 @@ case "$1" in
             rm -rf /etc/maas/templates/dhcp.maas-old
         fi
 
-        # Remove http directory
-        rm -rf /var/lib/maas/http
-        rm -rf /var/log/maas/http
-
         # Remove rpc.state file
         rm -f /var/lib/maas/rpc.state
 
@@ -55,9 +51,3 @@ esac
 if [ -L /etc/tgt/conf.d/maas.conf ]; then
     rm -rf /etc/tgt/conf.d/maas.conf
 fi
-
-# MAAS installation disables system nginx so it doesn't
-# prevent MAAS from running our own nginx daemon. As such,
-# on removal, reenable nginx.
-deb-systemd-helper enable 'nginx.service' >/dev/null || true
-deb-systemd-invoke start 'nginx.service' >/dev/null || true