aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xshare/hydractl/backup-site10
1 files changed, 7 insertions, 3 deletions
diff --git a/share/hydractl/backup-site b/share/hydractl/backup-site
index 70baf3d..ec1f8f3 100755
--- a/share/hydractl/backup-site
+++ b/share/hydractl/backup-site
@@ -25,8 +25,8 @@ SITES="/var/sites"
SITE="$1"
PACK="$1.tar.bz2"
DATE="`date +%Y%m%d`"
-DEST_BASE="$SITES/backups"
-DEST_BASE_SITE="$DEST_BASE/site/$SITE"
+DEST_BASE="$SITES/backups/site"
+DEST_BASE_SITE="$DEST_BASE/$SITE"
DEST="$DEST_BASE_SITE/`facter hostname`/$DATE"
# Syntax check.
@@ -60,8 +60,12 @@ fi
mkdir -p $DEST_BASE
touch $DEST_BASE/index.html
+# Fix old paths
+rm -f $DEST_BASE/../index.html
+rm -f $DEST_BASE/../robots.txt
+
# Check robots.txt
-if [ ! -e "$DEST_BASE/robots.txt" ]; then
+if [ ! -e "$DEST_BASE/site/robots.txt" ]; then
echo 'User-agent: *' > $DEST_BASE/robots.txt
echo 'Disallow: /' >> $DEST_BASE/robots.txt
fi