Merge lp:~andreserl/maas/lp1482858_packaging into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Move /etc/maas/maas-http.conf to /usr/share/maas/maas-http.conf as
this is not a config we want users to modify. (LP: #1482858)

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-08-13 09:54:17 +0000
+++ debian/changelog	2015-08-13 17:28:47 +0000
@@ -1,4 +1,4 @@
-maas (1.9.0~alpha1+bzr4185-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.9.0~alpha1+bzr4191-0ubuntu1) UNRELEASED; urgency=medium
 
   * UNRELEASED
 
@@ -24,6 +24,8 @@
     and handle upgrades. (LP: #1482857)
   * Move /etc/maas/maas-proxy.conf to /usr/share/maas/maas-proxy.conf as
     this is not a config we want users to modify. (LP: #1482859)
+  * Move /etc/maas/maas-http.conf to /usr/share/maas/maas-http.conf as
+    this is not a config we want users to modify. (LP: #1482858)
 
  -- Andres Rodriguez <[e-mail]>  Fri, 12 Jun 2015 14:16:47 -0400
 

=== modified file 'debian/maas-cluster-controller.maintscript'
--- debian/maas-cluster-controller.maintscript	2015-02-18 04:09:08 +0000
+++ debian/maas-cluster-controller.maintscript	2015-08-13 17:28:47 +0000
@@ -5,3 +5,12 @@
 rm_conffile /etc/init/maas-cluster.conf 1.7.0~beta6+bzr3231-0ubuntu1
 rm_conffile /etc/init/maas-cluster-register.conf 1.7.0~beta6+bzr3231-0ubuntu1
 rm_conffile /etc/maas/maas-cluster-http.conf 1.8.0~alpha1+bzr3522-0ubuntu1
+rm_conffile /etc/maas/templates/power/apc.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/ipmi.conf 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/ipmi.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/mscm.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/msftocs.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/sm15k.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/ucsm.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/virsh.template 1.9.0~alpha1+bzr4184-0ubuntu1
+rm_conffile /etc/maas/templates/power/vmware.template 1.9.0~alpha1+bzr4184-0ubuntu1

=== modified file 'debian/maas-region-controller-min.install'
--- debian/maas-region-controller-min.install	2015-06-24 21:23:05 +0000
+++ debian/maas-region-controller-min.install	2015-08-13 17:28:47 +0000
@@ -5,7 +5,7 @@
 debian/tmp/usr/share/maas/web/static
 
 # Install Apache Config
-debian/tmp/etc/maas/maas-http.conf
+debian/tmp/usr/share/maas/maas-http.conf
 
 # Install new preseed files
 debian/tmp/etc/maas/preseeds

=== modified file 'debian/maas-region-controller-min.maintscript'
--- debian/maas-region-controller-min.maintscript	2014-09-29 18:07:37 +0000
+++ debian/maas-region-controller-min.maintscript	2015-08-13 17:28:47 +0000
@@ -4,3 +4,4 @@
 rm_conffile /etc/maas/maas_local_celerconfig.py 1.7.0~beta4+bzr3124-0ubuntu1
 rm_conffile /usr/share/maas/maas_local_celerconfig.py 1.7.0~beta4+bzr3124-0ubuntu1
 rm_conffile /etc/maas/maas_local_celeryconfig.py 1.7.0~beta4+bzr3124-0ubuntu1
+rm_conffile /etc/maas/maas-http.conf 1.9.0~alpha1+bzr4190-0ubuntu1

=== modified file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst	2015-07-10 15:23:08 +0000
+++ debian/maas-region-controller-min.postinst	2015-08-13 17:28:47 +0000
@@ -9,9 +9,9 @@
 
 configure_region_http() {
     # handle apache configs
-    if [ -e /etc/maas/maas-http.conf -a \
+    if [ -e /usr/share/maas/maas-http.conf -a \
         ! -e /etc/apache2/conf-enabled/maas-http.conf ]; then
-        ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf
+        ln -sf /usr/share/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf
     fi
 
     # enable apache modules needed