Add --hard-links to rsync options

diff --git a/modules/roles/files/static-mirroring/static-master-ssh-wrap b/modules/roles/files/static-mirroring/static-master-ssh-wrap
index 6041a567b31441e314a202e965d0aa5d8d70efa5..9c543bf0f1ec12cc9e6ac3bf7fc517462d4da290 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-master-ssh-wrap
+++ b/modules/roles/files/static-mirroring/static-master-ssh-wrap
@@ -73,7 +73,7 @@ lock() {
 do_rsync() {
        local remote_host="$1"; shift
 
-       local args="--server --sender -vltrze.iLsf --safe-links ."
+       local args="--server --sender -vlHtrze.iLsf --safe-links ."
        if [ "$*" = "$args -new-/" ] || [ "$*" = "$args ./-new-/" ] ; then
                local path="$BASEDIR/current-push"
                info "serving $remote_host with $path"

diff --git a/modules/roles/files/static-mirroring/static-master-update-component b/modules/roles/files/static-mirroring/static-master-update-component
index af8a5f7e2372644cde71c624e5b207bdd4f44aa8..6f7ff03aae6c6515b3f6209dc50b0c048fd21118 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-master-update-component
+++ b/modules/roles/files/static-mirroring/static-master-update-component
@@ -110,7 +110,7 @@ echo "$0: Got them."
 echo "$0: Updating master copy of $component..."
 rsync --delete \
   -trz \
-  --links --safe-links \
+  --links --hard-links --safe-links \
   --link-dest="$tgt" \
   "$src/." "$tmpdir_new/."
 echo "$0: Done.  Committing."

diff --git a/modules/roles/files/static-mirroring/static-mirror-run b/modules/roles/files/static-mirroring/static-mirror-run
index b2bc078e1c3ed148eb7b3da459bc06dad472fdff..038700ddb73a4497e61b7ab834a9011823f8783f 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-mirror-run
+++ b/modules/roles/files/static-mirroring/static-mirror-run
@@ -64,7 +64,7 @@ if [ -z "$BASEDIR" ]; then usage >&2; exit 1; fi
 if [ -z "$SYNC_SOURCE" ]; then usage >&2; exit 1; fi
 
 RSYNC="rsync"
-RSYNC_BASE_OPTIONS="-rtvz --delete --links --safe-links"
+RSYNC_BASE_OPTIONS="-rtvz --delete --links --hard-links --safe-links"
 RSYNC_SSH_OPTIONS="ssh -o AddressFamily=inet -o BatchMode=yes"
 
 LOGDIR="$HOME/logs"

diff --git a/modules/roles/files/static-mirroring/static-mirror-ssh-wrap b/modules/roles/files/static-mirroring/static-mirror-ssh-wrap
index 9114879023f226fe9a893b2265b9dd37ce923b9d..3b1d99896b1e435d5c3823ebd5a540080e710c6a 100755 (executable)
--- a/modules/roles/files/static-mirroring/static-mirror-ssh-wrap
+++ b/modules/roles/files/static-mirroring/static-mirror-ssh-wrap
@@ -76,7 +76,7 @@ do_rsync() {
 
        if [ -e "$COMPONENTLIST" ]; then
                for path in $(awk -v host="$(hostname -f)" '$2 == host {print $3}' $COMPONENTLIST); do
-                       allowed_rsyncs+=("--server --sender -ltrze.iLsf --safe-links . $path/.")
+                       allowed_rsyncs+=("--server --sender -ltHrze.iLsf --safe-links . $path/.")
                done
        fi
        for cmd_idx in ${!allowed_rsyncs[*]}; do

diff --git a/modules/roles/manifests/static_mirror.pp b/modules/roles/manifests/static_mirror.pp
index cc9b2106668ccde1a9d623fa8640960f392a6bf2..c98464c37fa39af83c194601ec1817bcd71efe45 100644 (file)
--- a/modules/roles/manifests/static_mirror.pp
+++ b/modules/roles/manifests/static_mirror.pp
@@ -40,7 +40,7 @@ class roles::static_mirror {
                content => template('roles/static-mirroring/vhost/planet.debian.org.erb'),
        }
 
-       apache2::site { '10-static-vhosts-simple':
+       apache2::site { '010-static-vhosts-simple':
                site => "static-vhosts-simple",
                content => template('roles/static-mirroring/vhost/static-vhosts-simple.erb'),
        }