From 0ea0e9020080bb64680ce35039d1cdcb71132069 Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Thu, 5 May 2022 02:14:58 -0400
Subject: [PATCH] use new rsync fsync parameter

---
 certbot-replicate |  4 ++--
 deploy-static     | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/certbot-replicate b/certbot-replicate
index ef6dc05b..19806e9b 100755
--- a/certbot-replicate
+++ b/certbot-replicate
@@ -9,7 +9,7 @@ for replica in ${replicas[@]}; do
     echo Deploying to $replica
     echo
 
-    rsync -rptvl --progress --delete /etc/letsencrypt/ $replica:/etc/letsencrypt
-    rsync -rptvl --progress --delete /etc/nginx/ocsp-cache/ $replica:/etc/nginx/ocsp-cache
+    rsync -rptvl --fsync --progress --delete /etc/letsencrypt/ $replica:/etc/letsencrypt
+    rsync -rptvl --fsync --progress --delete /etc/nginx/ocsp-cache/ $replica:/etc/nginx/ocsp-cache
     ssh root@$replica nginx -s reload
 done
diff --git a/deploy-static b/deploy-static
index 287593c7..c063996d 100755
--- a/deploy-static
+++ b/deploy-static
@@ -30,13 +30,13 @@ for server in ${servers[@]}; do
     echo
 
     ssh $remote "rm -rf $target && cp -a $active $target"
-    rsync -rptcv --chmod=D755,F644 --delete static-tmp/ $remote:$target
-    ssh $remote "sync -f $target && ln -snf $target /srv/grapheneos.org && sync /srv/grapheneos.org"
+    rsync -rptcv --fsync --chmod=D755,F644 --delete static-tmp/ $remote:$target
+    ssh $remote "ln -snf $target /srv/grapheneos.org && sync /srv/grapheneos.org"
 
     sed "s|/srv/grapheneos.org|$target|" nginx-tmp/nginx.conf > nginx-tmp/nginx.conf.root
-    rsync -rptcv --chmod=D755,F644 --delete nginx-tmp/nginx.conf.root $remote:/etc/nginx/nginx.conf
-    rsync -rptcv --chmod=D755,F644 --delete nginx-tmp/snippets/ $remote:/etc/nginx/snippets
-    ssh $remote "sync /etc/nginx/nginx.conf /etc/nginx/snippets/* && nginx -s reload"
+    rsync -rptcv --fsync --chmod=D755,F644 --delete nginx-tmp/nginx.conf.root $remote:/etc/nginx/nginx.conf
+    rsync -rptcv --fsync --chmod=D755,F644 --delete nginx-tmp/snippets/ $remote:/etc/nginx/snippets
+    ssh $remote nginx -s reload
 
     echo
     echo active is now $target