Merge ~andreserl/maas:lp1513775_fix_named_init_config_packaging into maas:master

[Andres Rodriguez]

LP: #1513775 - Merge maas-dns into maas-region-api

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: e52ca12700f9c8a4cbf72a90b8f12f4e0341dbaa

review: Approve

[MAAS Lander (maas-lander)]

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

STATUS: SUCCESS
COMMIT: 296322cf549f2880941503663c42a6d2b5c88e81

review: Approve

[Newell Jensen (newell-jensen)]

+1

review: Approve

[Mike Pontillo (mpontillo)]

Looks reasonable to me; just a couple questions below.

[MAAS Lander (maas-lander)]

LANDING
-b lp1513775_fix_named_init_config_packaging lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2235/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b lp1513775_fix_named_init_config_packaging lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2238/consoleText

diff --git a/debian/control b/debian/control
index 5281720..a68a402 100644
--- a/debian/control
+++ b/debian/control
@@ -67,7 +67,8 @@ Description: MAAS server common files
 
 Package: maas-region-api
 Architecture: all
-Depends: bind9utils,
+Depends: bind9 (>= 1:9.10.3.dfsg.P2-5~),
+         bind9utils,
          iproute2,
          libjs-angularjs,
          libjs-yui3-full,
@@ -88,9 +89,9 @@ Depends: bind9utils,
          ubuntu-keyring,
          ${misc:Depends},
          ${python3:Depends}
-Conflicts: maas-region-controller-min, ntp
-Replaces: maas-region-controller-min
-Provides: maas-region-controller-min
+Conflicts: maas-region-controller-min, maas-dns, ntp
+Replaces: maas-region-controller-min, maas-dns
+Provides: maas-region-controller-min, maas-dns
 Description: Region controller API service for MAAS
  The MAAS region controller consists of REST API services and a postgres
  database. This package installs only the API services (maas-regiond).
@@ -101,7 +102,6 @@ Architecture: all
 Depends: avahi-utils,
          dbconfig-pgsql,
          iputils-ping,
-         maas-dns (= ${binary:Version}),
          maas-region-api (= ${binary:Version}),
          postgresql (>= 9.1),
          tcpdump,
@@ -275,15 +275,15 @@ Description: MAAS DHCP server
  This package installs and configures a DHCP server that can be used by
  MAAS, and enhances the overall MAAS user experience.
 
-Package: maas-dns
-Architecture: all
-Depends: bind9 (>= 1:9.10.3.dfsg.P2-5~),
-         maas-region-api (= ${binary:Version}),
-         ${misc:Depends}
-Conflicts: dnsmasq
-Description: MAAS DNS server
- This package installs and configures a DNS server that can be used by
- MAAS, and enhances the overall MAAS user experience.
+#Package: maas-dns
+#Architecture: all
+#Depends: bind9 (>= 1:9.10.3.dfsg.P2-5~),
+#         maas-region-api (= ${binary:Version}),
+#         ${misc:Depends}
+#Conflicts: dnsmasq
+#Description: MAAS DNS server
+# This package installs and configures a DNS server that can be used by
+# MAAS, and enhances the overall MAAS user experience.
 
 Package: maas-proxy
 Architecture: all
diff --git a/debian/maas-region-api.dirs b/debian/maas-region-api.dirs
new file mode 100644
index 0000000..f49acc7
--- /dev/null
+++ b/debian/maas-region-api.dirs
@@ -0,0 +1 @@
+etc/bind/maas
diff --git a/debian/maas-region-api.postinst b/debian/maas-region-api.postinst
index 7e512c4..1f396d7 100644
--- a/debian/maas-region-api.postinst
+++ b/debian/maas-region-api.postinst
@@ -37,6 +37,40 @@ configure_libdir() {
     fi
 }
 
+edit_named_options() {
+    # Remove any existing MAAS-related include line from
+    # /etc/bind/named.conf.local, then re-add it.
+    sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
+    maas-region get_named_conf --edit --config_path /etc/bind/named.conf.local
+
+    # Add a line in /etc/bind/named.conf.options that includes the
+    # /etc/named/maas/named.conf.options.inside.maas file.
+    maas-region edit_named_options --config-path /etc/bind/named.conf.options
+}
+
+fix_dns_permissions() {
+    if [ -d /etc/bind/maas ]; then
+        chown maas:root /etc/bind/maas
+        chown -R maas:maas /etc/bind/maas/*
+    fi
+    if [ -f /etc/bind/maas/named.conf.maas ]; then
+        chown maas:maas /etc/bind/maas/named.conf.maas
+        chmod 644 /etc/bind/maas/named.conf.maas
+    fi
+    if [ -f /etc/bind/maas/named.conf.options.inside.maas ]; then
+        chown maas:maas /etc/bind/maas/named.conf.options.inside.maas
+        chmod 644 /etc/bind/maas/named.conf.options.inside.maas
+    fi
+    if [ -f /etc/bind/maas/rndc.conf.maas ]; then
+        chown maas:root /etc/bind/maas/rndc.conf.maas
+        chmod 600 /etc/bind/maas/rndc.conf.maas
+    fi
+    if [ -f /etc/bind/maas/named.conf.rndc.maas ]; then
+        chown maas:bind /etc/bind/maas/named.conf.rndc.maas
+        chmod 640 /etc/bind/maas/named.conf.rndc.maas
+    fi
+}
+
 # Unconditionally ensure that there is at least an empty configuration
 # file. This does *not* overwrite any existing configuration.
 maas-region local_config_set
@@ -44,14 +78,25 @@ maas-region local_config_set
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     configure_logging
     configure_libdir
+    # Configure DNS
+    # If /etc/bind/maas is empty, set_up_dns.
+    if [ ! "$(ls -A /etc/bind/maas)" ]; then
+        maas-region set_up_dns
+    fi
+    fix_dns_permissions
+    edit_named_options
 
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
     # Logging changed at r2611, ensure it is set up.
     configure_logging
     configure_libdir
-
+    # Configure DNS
+    fix_dns_permissions
+    edit_named_options
 fi
 
+invoke-rc.d bind9 restart || true
+
 db_stop
 
 #DEBHELPER#
diff --git a/debian/maas-region-api.postrm b/debian/maas-region-api.postrm
index 9739968..c79533e 100644
--- a/debian/maas-region-api.postrm
+++ b/debian/maas-region-api.postrm
@@ -7,6 +7,14 @@ set -e
 RELEASE=`lsb_release -rs` ||  RELEASE=""
 
 case "$1" in
+    remove)
+        if [ -f /etc/bind/named.conf.local ]; then
+            sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.maas\"\;$/d' \
+                /etc/bind/named.conf.local
+            sed -i '/^include.*\"\/etc\/bind\/maas\/named.conf.options.inside.maas\"\;$/d' \
+                /etc/bind/named.conf.options
+        fi
+        ;;
     purge)
         # Remove logging files & foldesr
         rm -rf /var/log/maas/regiond.log*
@@ -24,8 +32,18 @@ case "$1" in
         rm -rf /usr/share/maas/maas/
         rm -rf /etc/maas/regiond.conf
         rm -rf /etc/maas/templates.maas-old
+
+        # Remove zone files
+        if [ -d /etc/bind/maas ]; then
+            rm -rf /etc/bind/maas
+        fi
+        ;;
 esac
 
+if [ -x /usr/sbin/invoke-rc.d ]; then
+    invoke-rc.d bind9 restart || true
+fi
+
 #DEBHELPER#
 
 db_stop