summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcertbot-replicate18
-rwxr-xr-xdeploy-static64
-rw-r--r--[-rwxr-xr-x]indexnow.py (renamed from indexnow)4
3 files changed, 1 insertions, 85 deletions
diff --git a/certbot-replicate b/certbot-replicate
deleted file mode 100755
index ef7d9cf4..00000000
--- a/certbot-replicate
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-set -o errexit -o nounset -o pipefail
-
-status=0
-replicas=({1..3}.grapheneos.org)
-
-for replica in ${replicas[@]}; do
- echo
- echo Deploying to $replica
- echo
-
- rsync -rpcvl --delete --fsync --preallocate /etc/letsencrypt/ $replica:/etc/letsencrypt &&
- ssh root@$replica nginx -s reload ||
- status=1
-done
-
-exit $status
diff --git a/deploy-static b/deploy-static
deleted file mode 100755
index 6afdedad..00000000
--- a/deploy-static
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-
-set -o errexit -o nounset -o pipefail
-shopt -s extglob
-
-touch lock
-exec {fd}< lock
-if ! flock -n $fd; then
- echo already processing/deploying static files >&2
- exit 1
-fi
-
-./process-static $fd
-
-servers=({0..3}.grapheneos.org)
-
-rsync -pcv --chmod=F755 --fsync --preallocate certbot-replicate root@${servers[0]}:/usr/local/bin/
-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-production
-rsync -pcv --chmod=D755,F644 --fsync --preallocate static-production/sitemap.xml{,.gz,.br} static-tmp/
-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
-changed="$(./generate-sitemap)"
-xmllint --noblanks static-tmp/sitemap.xml --output static-tmp/sitemap.xml
-brotli -f static-tmp/sitemap.xml
-zopfli static-tmp/sitemap.xml
-rsync -pcv --chmod=D755,F644 --fsync --preallocate static-tmp/sitemap.xml{,.gz,.br} static-production/
-
-for server in ${servers[@]}; do
- echo $server
-
- remote=root@$server
- active=$(ssh $remote readlink /srv/grapheneos.org)
-
- if [[ $active = /srv/grapheneos.org_a ]]; then
- target=/srv/grapheneos.org_b
- else
- target=/srv/grapheneos.org_a
- fi
-
- echo active is $active
- echo target is $target
- echo
-
- ssh $remote "rm -rf $target && cp -a $active $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
- rsync -rpcv --chmod=D755,F644 --delete --fsync --preallocate nginx-tmp/{nginx.conf,mime.types,root_grapheneos.org.conf,snippets} $remote:/etc/nginx/
- ssh $remote nginx -s reload
-
- echo
- echo active is now $target
- echo
-done
-
-if [[ -n "$changed" ]]; then
- ./indexnow <<< "$changed"
-fi
diff --git a/indexnow b/indexnow.py
index dbd98b4c..aa4f6b5d 100755..100644
--- a/indexnow
+++ b/indexnow.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
import sys
import requests
@@ -17,7 +15,7 @@ for url in urls:
if not validators.url(url):
sys.exit(3)
-host = "grapheneos.org"
+host = "hakurei.app"
api_url = "https://api.indexnow.org/indexnow"
with open("indexnow-key.txt") as keyfile: