Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:enforce-perms-for-1-stage-sync into ubuntu-mirror-charm:master

[Paul Collins]

import permission-correction from mirror-2stage.sh

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Haw Loeung (hloeung)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision e5c2fcf7e82aa72aa38be73b688e1b2ecc0cfb97

diff --git a/files/mirror-1stage.sh b/files/mirror-1stage.sh
index f578059..4832970 100755
--- a/files/mirror-1stage.sh
+++ b/files/mirror-1stage.sh
@@ -83,6 +83,10 @@ rsync --verbose --recursive --times --links --hard-links \
   --exclude ".~tmp~" \
   ${url} ${DEST_DIR} || fatal "Failed to rsync from ${url}."
 
+log "== Making sure permissions are all correct =="
+find ${DEST_DIR} -type d ! -perm /o=r,o=x -ls -exec chmod go+rx '{}' +
+find ${DEST_DIR} -type f ! -perm /o=r -ls -exec chmod go+r '{}' +
+
 install -d "${DEST_DIR}/.trace/"
 date -u > "${DEST_DIR}/.trace/${role}-${myhostname}"