summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rwxr-xr-xdeploy-static8
2 files changed, 6 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 9bbca465..7037838f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
/nginx-tmp/
/node_modules/
/releases-base
-/static-deploy/
+/static-production/
+/static-staging/
/static-tmp/
/venv/
diff --git a/deploy-static b/deploy-static
index 51ca6c93..b4c39318 100755
--- a/deploy-static
+++ b/deploy-static
@@ -19,9 +19,9 @@ rsync -pcv --chmod=F755 --fsync --preallocate certbot-replicate root@${servers[0
rsync -pcv --chmod=F644 --fsync --preallocate replicate.conf root@${servers[0]}:/etc/systemd/system/certbot-renew.service.d/
# use last modified timestamps from 0.grapheneos.org
-rsync -rptcv --chmod=D755,F644 --delete --fsync --preallocate root@${servers[0]}:/srv/grapheneos.org/ static-deploy
-rsync -rpcv --chmod=D755,F644 --delete --fsync --preallocate static-tmp/ static-deploy
-for f in static-deploy/**.*(br|gz); do
+rsync -rptcv --chmod=D755,F644 --delete --fsync --preallocate root@${servers[0]}:/srv/grapheneos.org/ static-production
+rsync -rpcv --chmod=D755,F644 --delete --fsync --preallocate static-tmp/ static-production
+for f in static-production/**.*(br|gz); do
touch -r "${f%.*}" "$f"
done
@@ -42,7 +42,7 @@ for server in ${servers[@]}; do
echo
ssh $remote "rm -rf $target && cp -a $active $target"
- rsync -rptcv --chmod=D755,F644 --delete --fsync --preallocate static-deploy/ $remote:$target
+ rsync -rptcv --chmod=D755,F644 --delete --fsync --preallocate static-production/ $remote:$target
ssh $remote "ln -snf $target /srv/grapheneos.org && sync /srv/grapheneos.org"
echo "root $target;" > nginx-tmp/root_grapheneos.org.conf