commit 4c7f63e81f9e720e931d1ad5bad220d45ffe8fd1
author Ivan Berezovskiy <iberezovskiy@mirantis.com> Tue Nov 26 19:08:30 2019 +0400
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Tue Nov 26 15:09:56 2019 +0000
tree 6153f627ac9274a80634c65183db29e72cda7685
parent 32e87c69146412d5b47df152354b68843fa5700b

Restore /etc/maas permissions

PROD-33924

Change-Id: Iad0758d3d8fcda82a26286982218d22e5ee60b87

maas/files/restore.sh

diff --git a/maas/files/restore.sh b/maas/files/restore.sh
index 21eb46d..ef187be 100644
--- a/maas/files/restore.sh
+++ b/maas/files/restore.sh
@@ -32,8 +32,13 @@
 pg_restore {{ target }}/{{ db_name }}.pg_dump --dbname={{ db_name }} --no-password -c
 
 # Restore file permissions
-if [ "$(which setfacl)" != "" ] && [ -e /var/lib/maas/file_permissions.txt ]; then
-  setfacl --restore=/var/lib/maas/file_permissions.txt
+if [ "$(which setfacl)" != "" ]; then
+  if [ -e /etc/maas/file_permissions.txt ]; then
+    setfacl --restore=/etc/maas/file_permissions.txt
+  fi
+  if [ -e /var/lib/maas/file_permissions.txt ]; then
+    setfacl --restore=/var/lib/maas/file_permissions.txt
+  fi
 fi
 
 mkdir -p /root/maas/flags