From 0a6b4ba7fc1f1e251a32d59297bfaa8bf4c65eaa Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Thu, 25 Nov 2021 18:59:28 -0500
Subject: [PATCH] use nginx-tmp for final nginx.conf

---
 .gitignore    | 1 -
 deploy-static | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4bc4dc5b..1f0d17a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 nginx-tmp
-nginx.conf.root.tmp
 node_modules
 static-tmp
diff --git a/deploy-static b/deploy-static
index b2b81955..d2d43de0 100755
--- a/deploy-static
+++ b/deploy-static
@@ -33,9 +33,8 @@ for server in ${servers[@]}; do
     ssh $remote ln -snf $target /srv/grapheneos.org
     ssh $remote sync /srv/grapheneos.org
 
-    cp nginx-tmp/nginx.conf nginx.conf.root.tmp
-    sed -i "s|/srv/grapheneos.org|$target|" nginx.conf.root.tmp
-    rsync -rptcv --chmod=D755,F644 --delete nginx.conf.root.tmp $remote:/etc/nginx/nginx.conf
+    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/*'
     ssh $remote nginx -s reload