sts-sponsors team mailing list archive

[Christian Grabowski <mp+434650@xxxxxxxxxxxxxxxxxx>]

Christian Grabowski has proposed merging ~cgrabowski/maas:backport_fix_config_permissions_on_init_to_3.3 into maas:3.3.

Commit message:
change ownership of /etc/maas to maas:maas
(cherry picked from commit d56b56093ca83115659c8e83cc85588810e38e77)



Requested reviews:
  Christian Grabowski (cgrabowski)

For more details, see:
https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/434650
-- 
Your team MAAS Committers is subscribed to branch maas:3.3.

diff --git a/debian/maas-common.postinst b/debian/maas-common.postinst
index 67e9787..e01b158 100755
--- a/debian/maas-common.postinst
+++ b/debian/maas-common.postinst
@@ -17,6 +17,10 @@ configure_logging() {
     chown maas:maas /var/log/maas/maas.log
 }
 
+configure_conf_dir() {
+    chown maas:maas /etc/maas
+}
+
 configure_lib_dir() {
     # Ensure lib dir has correct permissions
     chown maas:maas /var/lib/maas/
@@ -42,6 +46,7 @@ add_user_group(){
 disable_nginx
 add_user_group
 configure_logging
+configure_conf_dir
 configure_lib_dir
 
 #DEBHELPER#
diff --git a/debian/maas-rack-controller.postinst b/debian/maas-rack-controller.postinst
index cbd92cd..531ae3b 100755
--- a/debian/maas-rack-controller.postinst
+++ b/debian/maas-rack-controller.postinst
@@ -145,6 +145,7 @@ fix_dns_permissions() {
 # Unconditionally ensure that there is at least an empty configuration
 # file. This does *not* overwrite any existing configuration.
 maas-rack config
+chown maas:maas /etc/maas/rackd.conf
 
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     configure_logging
diff --git a/debian/maas-region-api.postinst b/debian/maas-region-api.postinst
index 1502dc1..aa0d8b2 100755
--- a/debian/maas-region-api.postinst
+++ b/debian/maas-region-api.postinst
@@ -74,6 +74,7 @@ fix_dns_permissions() {
 # Unconditionally ensure that there is at least an empty configuration
 # file. This does *not* overwrite any existing configuration.
 maas-region local_config_set
+chown maas:maas /etc/maas/regiond.conf
 
 if [ "$1" = "configure" ]; then
     configure_logging