summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Micay <danielmicay@gmail.com>2021-03-30 10:58:04 -0400
committerDaniel Micay <danielmicay@gmail.com>2021-03-30 10:58:04 -0400
commit43949eb6379856eca7754c90974fc7c3034b7263 (patch)
tree75fe1fe443d3b6395a59c79f3cbb01d5e34caf9b
parent19f1f9b700519cecb01c66fe9c1a7e4c5b523304 (diff)
move static site root to /srv
-rwxr-xr-xdeploy_static10
-rw-r--r--nginx/nginx.conf2
2 files changed, 6 insertions, 6 deletions
diff --git a/deploy_static b/deploy_static
index 3de1ed42..3cfee43c 100755
--- a/deploy_static
+++ b/deploy_static
@@ -6,12 +6,12 @@ set -o errexit -o nounset -o pipefail
./process_static
remote=root@grapheneos.org
-active=$(ssh $remote readlink /var/www/html)
+active=$(ssh $remote readlink /srv/grapheneos.org)
-if [[ $active = /var/www/html_a ]]; then
- target=/var/www/html_b
+if [[ $active = /srv/grapheneos.org_a ]]; then
+ target=/srv/grapheneos.org_b
else
- target=/var/www/html_a
+ target=/srv/grapheneos.org_a
fi
echo active is $active
@@ -22,7 +22,7 @@ ssh $remote rm -rf $target
ssh $remote cp -a $active $target
rsync -rpcv --chmod=D755,F644 --delete static_tmp/ $remote:$target
ssh $remote sync -f $target
-ssh $remote ln -snf $target /var/www/html
+ssh $remote ln -snf $target /srv/grapheneos.org
ssh $remote sync .
rsync -rpcv --chmod=D755,F644 --delete nginx.conf.tmp $remote:/etc/nginx/nginx.conf
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 6c89bb5f..35234442 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -109,7 +109,7 @@ http {
listen [::]:443 ssl http2;
server_name grapheneos.org;
- root /var/www/html;
+ root /srv/grapheneos.org;
error_page 403 =404 /404.html;
error_page 404 /404.html;