~mcornick/www

a0fecceb6679631c2ef3224424189005372646dc — Mark Cornick 28 days ago 44c8401
Revert "Retire gemini"

This reverts commit 44c84011bdb1d7a0ed272e65d055d66eb2048389.
4 files changed, 80 insertions(+), 25 deletions(-)

M config-es.toml
M config.toml
M deploy.sh
M m3u-to-md.py
M config-es.toml => config-es.toml +17 -3
@@ 164,10 164,24 @@ url = "https://git.sdf.org/mcornick"
logoHomeLink = "/fr/"
logoText = "Mark Cornick"

[mediaTypes]
[mediaTypes."text/gemini"]
suffixes = ["gmi"]

[outputFormats]
[outputFormats.Gemini]
isHTML = false
isPlainText = true
mediaType = "text/gemini"
name = "GEMINI"
path = "gemini/"
permalinkable = true
protocol = "gemini://"

[outputs]
home = ["HTML", "RSS"]
page = ["HTML"]
section = ["HTML", "RSS"]
home = ["HTML", "GEMINI", "RSS"]
page = ["HTML", "GEMINI"]
section = ["HTML", "GEMINI", "RSS"]

[params]
centerTheme = false

M config.toml => config.toml +17 -3
@@ 164,10 164,24 @@ url = "https://git.sdf.org/mcornick"
logoHomeLink = "/fr/"
logoText = "Mark Cornick"

[mediaTypes]
[mediaTypes."text/gemini"]
suffixes = ["gmi"]

[outputFormats]
[outputFormats.Gemini]
isHTML = false
isPlainText = true
mediaType = "text/gemini"
name = "GEMINI"
path = "gemini/"
permalinkable = true
protocol = "gemini://"

[outputs]
home = ["HTML", "RSS"]
page = ["HTML"]
section = ["HTML", "RSS"]
home = ["HTML", "GEMINI", "RSS"]
page = ["HTML", "GEMINI"]
section = ["HTML", "GEMINI", "RSS"]

[params]
centerTheme = false

M deploy.sh => deploy.sh +45 -18
@@ 1,7 1,7 @@
#!/usr/bin/env bash
export TZ=UTC

deploy() {
deploy_www() {
  printf "%s... " "$1"
  rm -rf public
  cd content/show


@@ 15,9 15,10 @@ deploy() {
  hugo --config "config-$3.toml" --quiet --minify --baseURL "$1"
  case "$4" in
    rsync)
      rsync --ipv4 -a public/ "$2" >/dev/null 2>&1
      rsync --ipv4 --exclude "gemini" -a public/ "$2" >/dev/null 2>&1
      ;;
    rclone)
      rm -rf public/gemini public/**/gemini
      rclone copy public/ "$2"
      ;;
    *)


@@ 27,23 28,49 @@ deploy() {
  printf "done\n"
}

deploy_gemini() {
  printf "%s... " "$1"
  rm -rf public
  hugo --quiet --minify --baseURL "$1"
  mv public/blog/gemini/index.gmi public/gemini/blog/index.gmi
  mv public/show/gemini/index.gmi public/gemini/show/index.gmi
  cp static/pgpkey.txt public/gemini
  case "$4" in
    rsync)
      rsync --ipv4 -a public/gemini/ "$2" >/dev/null 2>&1
      ;;
    *)
      true
      ;;
  esac
  printf "done\n"
}

umask 0022

deploy https://markcornick.com/ fastmail: en rclone
deploy https://mcornick.is/ fastmail_is: en rclone
deploy https://aussies.space/~mcornick/ mcornick@aussies.space:/home/mcornick/public_html en rsync
deploy https://bsd.tilde.team/~mcornick/ mcornick@bsd.tilde.team:/home/mcornick/public_html en rsync
deploy https://ctrl-c.club/~mcornick/ mcornick@ctrl-c.club:/home/mcornick/public_html en rsync
deploy https://envs.net/~mcornick/ mcornick@envs.net:/home/mcornick/public_html en rsync
deploy https://mcornick.tilde.institute/ mcornick@tilde.institute:/home/mcornick/public_html en rsync
deploy http://rw.rs/~mcornick/ mcornick@rw.rs:/home/mcornick/public_html en rsync
deploy https://texto-plano.xyz/~mcornick/ mcornick@texto-plano.xyz:/home/mcornick/public_html es rsync
deploy https://thunix.net/~mcornick/ mcornick@thunix.net:/home/mcornick/public_html en rsync
deploy https://tilde.club/~mcornick/ mcornick@tilde.club:/home/mcornick/public_html en rsync
deploy https://tilde.team/~mcornick/ mcornick@tilde.team:/home/mcornick/public_html en rsync
deploy https://yourtilde.com/~mcornick/ mcornick@yourtilde.com:/home/mcornick/public_html en rsync
deploy https://mcornick.sdf.org/ mcornick@ma.sdf.org:/meta/m/mcornick/html en rsync
deploy_www https://markcornick.com/ fastmail: en rclone
deploy_www https://mcornick.is/ fastmail_is: en rclone
deploy_www https://aussies.space/~mcornick/ mcornick@aussies.space:/home/mcornick/public_html en rsync
deploy_www https://bsd.tilde.team/~mcornick/ mcornick@bsd.tilde.team:/home/mcornick/public_html en rsync
deploy_www https://ctrl-c.club/~mcornick/ mcornick@ctrl-c.club:/home/mcornick/public_html en rsync
deploy_www https://envs.net/~mcornick/ mcornick@envs.net:/home/mcornick/public_html en rsync
deploy_www https://mcornick.tilde.institute/ mcornick@tilde.institute:/home/mcornick/public_html en rsync
deploy_www http://rw.rs/~mcornick/ mcornick@rw.rs:/home/mcornick/public_html en rsync
deploy_www https://texto-plano.xyz/~mcornick/ mcornick@texto-plano.xyz:/home/mcornick/public_html es rsync
deploy_www https://thunix.net/~mcornick/ mcornick@thunix.net:/home/mcornick/public_html en rsync
deploy_www https://tilde.club/~mcornick/ mcornick@tilde.club:/home/mcornick/public_html en rsync
deploy_www https://tilde.team/~mcornick/ mcornick@tilde.team:/home/mcornick/public_html en rsync
deploy_www https://yourtilde.com/~mcornick/ mcornick@yourtilde.com:/home/mcornick/public_html en rsync
deploy_www https://mcornick.sdf.org/ mcornick@ma.sdf.org:/meta/m/mcornick/html en rsync
ssh mcornick@ma.sdf.org mkhomepg -p >/dev/null 2>&1
deploy https://mcornick.sdf.org/ mcornick@sdf.org:/sdf/arpa/gm/m/mcornick/html en rsync
deploy https://mcornick.com/ mcornick@sdf.org:/sdf/arpa/gm/m/mcornick/html/mcornick.com en rsync
deploy_www https://mcornick.sdf.org/ mcornick@sdf.org:/sdf/arpa/gm/m/mcornick/html en rsync
deploy_www https://mcornick.com/ mcornick@sdf.org:/sdf/arpa/gm/m/mcornick/html/mcornick.com en rsync
ssh mcornick@sdf.org mkhomepg -p >/dev/null 2>&1

deploy_gemini gemini://gemini.ctrl-c.club/~mcornick/ mcornick@ctrl-c.club:/home/mcornick/public_gemini en rsync
deploy_gemini gemini://envs.net/~mcornick/ mcornick@envs.net:/home/mcornick/public_gemini en rsync
deploy_gemini gemini://tilde.pink/~mcornick/ mcornick@tilde.pink:/home/mcornick/public_gemini en rsync
deploy_gemini gemini://tilde.team/~mcornick/ mcornick@tilde.team:/home/mcornick/public_gemini en rsync
deploy_gemini gemini://gem.sdf.org/mcornick/ mcornick@ma.sdf.org:/meta/m/mcornick/gemini en rsync
deploy_gemini gemini://sdf.org/mcornick/ mcornick@sdf.org:/sdf/arpa/gm/m/mcornick/gopher en rsync
ssh mcornick@sdf.org mkgopher -p >/dev/null 2>&1

M m3u-to-md.py => m3u-to-md.py +1 -1
@@ 1,5 1,5 @@
#!/usr/bin/env python3
'''Create markdown documents from playlists.'''
'''Create markdown and gemini documents from playlists.'''

import re
import sys