fmaury/seirdy.one
1
0
Fork 0
mirror of https://git.sr.ht/~seirdy/seirdy.one synced 2024-11-23 21:02:09 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: fmaury:63929680414c643c07f3b69518832309c43365eb
Branches Tags
fmaury:master
fmaury:draft-searchengines
...
compare: fmaury:c4fd87aa09379a6fa7de4edc34bd06eecdcad6b1
Branches Tags
fmaury:master
fmaury:draft-searchengines

2 commits
6392968041 ... c4fd87aa09

Author SHA1 Message Date
Seirdy
c4fd87aa09
teehee :3 2024-06-21 13:03:08 -04:00
Seirdy
eb6d1494ba
Clean up some deployment bits 
- setup-ci.sh: stop writing an ssh config since I pass around options on
  the CLI.
- Makefile: tidy some things, remove unused stuff, add some docs.
- Makefile: clean up unnecessary dupe files from rsync output a bit
 2024-06-20 16:08:33 -04:00
4 changed files with 12 additions and 13 deletions
Show stats Expand all files Collapse all files

13
Makefile
View file

@ -12,16 +12,14 @@ WWW_RSYNC_DEST = $(USER):$(WWW_ROOT)
GEMINI_RSYNC_DEST = $(USER):$(GEMINI_ROOT) GEMINI_RSYNC_DEST = $(USER):$(GEMINI_ROOT)
OUTPUT_DIR = public OUTPUT_DIR = public
SSHFLAGS = -o KexAlgorithms=sntrup761x25519-sha512@openssh.com SSHFLAGS = -o KexAlgorithms=sntrup761x25519-sha512@openssh.com -o VerifyHostKeyDNS=yes
RSYNCFLAGS += -rlpcv --zc=zstd --zl=6 --skip-compress=gz/br/zst/png/webp/jpg/avif/jxl/mp4/mkv/webm/opus/mp3/gif/ico -e "ssh $(SSHFLAGS)" --chmod=D755,F644 SKIP_COMPRESS=gz/br/zst/png/webp/jpg/avif/jxl/mp4/mkv/webm/opus/mp3/gif/ico
RSYNCFLAGS += -rlpcv --zc=zstd --zl=6 --skip-compress=$(SKIP_COMPRESS) -e "ssh $(SSHFLAGS)" --chmod=D755,F644
RSYNCFLAGS_EXTRA ?= RSYNCFLAGS_EXTRA ?=
# compression gets slow for extreme levels like the old "70109". # compression gets slow for extreme levels like the old "70109".
# Diminishing returns after level 6; sometimes even larger files. # Diminishing returns after level 6; sometimes even larger files.
ECT_LEVEL=6 ECT_LEVEL=6
# For quick builds, just build these sections:
RENDER_SECTIONS=entries
csv/webrings.csv: csv/webrings.csv:
sh scripts/populate-webrings.sh sh scripts/populate-webrings.sh
@ -138,9 +136,12 @@ xhtmlize: hugo
copy-to-xhtml: copy-to-xhtml:
find $(OUTPUT_DIR) -type f -name "*.html" | grep -v 'resume/index.html' | xargs -n1 sh scripts/copy-file-to-xhtml.sh find $(OUTPUT_DIR) -type f -name "*.html" | grep -v 'resume/index.html' | xargs -n1 sh scripts/copy-file-to-xhtml.sh
# The grep command at the end makes the output much less noisy.
# filter out duplicate xhtml files (they're just copies of the .html files)
# filter gzip files (their zopfli-like compression is not deterministic)
.PHONY: deploy-html .PHONY: deploy-html
deploy-html: deploy-html:
rsync $(RSYNCFLAGS) $(RSYNCFLAGS_EXTRA) --exclude 'gemini' --exclude '*.gmi' --exclude-from .rsyncignore $(OUTPUT_DIR)/ $(WWW_RSYNC_DEST) --delete | grep -v 'l\.gz$$' rsync $(RSYNCFLAGS) $(RSYNCFLAGS_EXTRA) --exclude 'gemini' --exclude '*.gmi' --exclude-from .rsyncignore $(OUTPUT_DIR)/ $(WWW_RSYNC_DEST) --delete | grep -Ev '\.(gz|xhtml)$$'
.PHONY: deploy-gemini .PHONY: deploy-gemini
deploy-gemini: deploy-gemini:

2
content/about/_index.gmi
View file

@ -53,7 +53,7 @@ Currently living somewhere in New England, USA.
More info: More info:
* Time zone: "America/New_York" (EDT or EST) * Time zone: "America/New_York" (EDT or EST)
* Age: 23 * Age: 24
## Location (Seirdy, They/Them, online) ## Location (Seirdy, They/Them, online)

2
content/about/_index.md
View file

@ -23,7 +23,7 @@ I intentionally make very delayed updates to information such as my location.
<dl> <dl>
<dt>Age</dt> <dt>Age</dt>
<dd><time datetime="P8400D">23</time></dd> <dd><time datetime="P8766D">24</time></dd>
<dt>Location</dt> <dt>Location</dt>
<dd>Somewhere in <span itemprop="homeLocation" itemscope="" itemtype="https://schema.org/Place" class="p-region">New England</span>, <abbr itemprop="nationality" itemscope="" itemtype="https://schema.org/Country" class="p-country-name" title="United States of America">USA</abbr></dd> <dd>Somewhere in <span itemprop="homeLocation" itemscope="" itemtype="https://schema.org/Place" class="p-region">New England</span>, <abbr itemprop="nationality" itemscope="" itemtype="https://schema.org/Country" class="p-country-name" title="United States of America">USA</abbr></dd>

8
scripts/setup-ci.sh
View file

@ -5,12 +5,10 @@
# no pipefail here since there are no pipes. # no pipefail here since there are no pipes.
set -eux set -eux
# configure ssh
echo "VerifyHostKeyDNS=yes
KexAlgorithms=sntrup761x25519-sha512@openssh.com" >> ~/.ssh/config
# mirrored at https://seirdy.one/pb/binaries.tar.gz # mirrored at https://seirdy.one/pb/binaries.tar.gz
rsync -WPv deploy@seirdy.one:/var/www/pb/binaries.tar.gz . rsync -WPv \
-e "ssh -o KexAlgorithms=sntrup761x25519-sha512@openssh.com -o VerifyHostKeyDNS=yes" \
deploy@seirdy.one:/var/www/pb/binaries.tar.gz .
mkdir -p ~/bin mkdir -p ~/bin
tar xzf binaries.tar.gz -oC ~/bin tar xzf binaries.tar.gz -oC ~/bin
rm binaries.tar.gz rm binaries.tar.gz