diff --git a/.gitignore b/.gitignore index aa2a31b..cb638e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -nginx.conf.tmp +nginx-tmp static-tmp diff --git a/deploy-static b/deploy-static index 43019d1..5bb8cec 100755 --- a/deploy-static +++ b/deploy-static @@ -24,8 +24,8 @@ ssh $remote sync -f $target ssh $remote ln -snf $target /srv/element.grapheneos.org ssh $remote sync /srv/element.grapheneos.org -sed -i "s|/srv/element.grapheneos.org|$target|" nginx.conf.tmp -rsync -rpcv --chmod=D755,F644 --delete nginx.conf.tmp $remote:/etc/nginx/nginx.conf +sed -i "s|/srv/element.grapheneos.org|$target|" nginx-tmp/nginx.conf +rsync -rpcv --chmod=D755,F644 --delete nginx-tmp/nginx.conf $remote:/etc/nginx/nginx.conf ssh $remote sync -f /etc/nginx/nginx.conf ssh $remote nginx -s reload diff --git a/process-static b/process-static index 7bf6ce4..03a1eb7 100755 --- a/process-static +++ b/process-static @@ -5,12 +5,13 @@ shopt -s dotglob extglob globstar export PATH="$PWD/node_modules/.bin:$PATH" +rm -rf nginx-tmp +cp -a nginx nginx-tmp + rm -rf static-tmp cp -a /usr/share/webapps/element static-tmp cp --remove-destination webapps/element/config.json static-tmp/config.json -cp nginx/nginx.conf nginx.conf.tmp - brotli_k() { brotli -k "$@" }