ambient.yaml: note why subplot-web is distabled

Signed-off-by: Lars Wirzenius <liw@liw.fi>
Sponsored-by: author

3 files changed, 220 insertions, 213 deletions

diff --git a/ambient.yaml b/ambient.yaml
index 7dc96e8..4813ef4 100644
--- a/ambient.yaml
+++ b/ambient.yaml
@@ -1,5 +1,29 @@
 projects:
 
+  256.liw.fi:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/sites/256.liw.fi/src
+    publish_artifacts: true
+    plan:
+      - action: shell
+        shell: |
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+
+  ambient-web:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/pers/ambient-ci/ambient-web/src/
+    publish_artifacts: true
+    plan:
+      - action: shell
+        shell: |
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+
   apt.liw.fi-keyring:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/apt.liw.fi-keyring/git
@@ -8,11 +32,17 @@ projects:
       # Note: no auto-incrementing version number for this package
       - action: deb
 
-  extrautils:
+  cachedir:
     image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/extrautils/git
+    source: ~/pers/obnam/cachedir
     publish_artifacts: true
+    pre_plan:
+      - action: cargo_fetch
     plan:
+      - action: rustup_setup
+      - action: cargo_clippy
+      - action: cargo_build
+      - action: cargo_test
       - action: shell
         shell: |
           export PATH="/root/.cargo/bin:$PATH"
@@ -24,10 +54,10 @@ projects:
           dch -r ''
       - action: deb
 
-  html-page:
+  clab:
     image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/html-page/git
-    publish_artifacts: false
+    source: ~/pers/clab/git
+    publish_artifacts: true
     pre_plan:
       - action: cargo_fetch
     plan:
@@ -35,18 +65,42 @@ projects:
       - action: cargo_clippy
       - action: cargo_build
       - action: cargo_test
+      - action: shell
+        shell: |
+          export PATH="/root/.cargo/bin:$PATH"
+          subplot codegen clab.subplot -o test.py
+          rm -f test.log
+          if ! python3 test.py --log test.log; then
+              cat test.log
+              exit 1
+          fi
+          rm -f test.log test.py
+          git status --ignored
 
-  cachedir:
+          V="$(dpkg-parsechangelog -SVersion | sed 's/-[^-]*$//')"
+          T="$(date -u "+%Y%m%dT%H%M%S")"
+          version="$V.ci$T-1"
+          dch -v "$version" "CI build under Ambient."
+          dch -r ''
+      - action: deb
+
+  ewww.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/obnam/cachedir
+    source: ~/pers/ewww/ewww.liw.fi/src
+    publish_artifacts: true
+    plan:
+      - action: shell
+        shell: |
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+
+  extrautils:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/pers/extrautils/git
     publish_artifacts: true
-    pre_plan:
-      - action: cargo_fetch
     plan:
-      - action: rustup_setup
-      - action: cargo_clippy
-      - action: cargo_build
-      - action: cargo_test
       - action: shell
         shell: |
           export PATH="/root/.cargo/bin:$PATH"
@@ -58,6 +112,76 @@ projects:
           dch -r ''
       - action: deb
 
+  gtdfh.liw.fi:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/sites/gtdfh.liw.fi/src
+    publish_artifacts: true
+    plan:
+      - action: shell
+        shell: |
+          make
+          cp gtdfh.html /workspace/artifacts/index.html
+
+  html-page:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/pers/html-page/git
+    publish_artifacts: false
+    pre_plan:
+      - action: cargo_fetch
+    plan:
+      - action: rustup_setup
+      - action: cargo_clippy
+      - action: cargo_build
+      - action: cargo_test
+
+  ick.liw.fi:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/sites/ick.liw.fi/src
+    publish_artifacts: true
+    plan:
+      - action: shell
+        shell: |
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+
+  liw.fi:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/sites/liw.fi/src
+    publish_artifacts: true
+    plan:
+      - action: shell
+        shell: |
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+
+  manifesto.liw.fi:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/sites/manifesto.liw.fi/src
+    publish_artifacts: true
+    plan:
+      - action: shell
+        shell: |
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+
+  noir.liw.fi:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/sites/noir.liw.fi/src
+    publish_artifacts: true
+    plan:
+      - action: shell
+        shell: |
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+
   obnam:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/obnam/git
@@ -118,27 +242,17 @@ projects:
           dch -r ''
       - action: deb
 
-  summain:
+  obnam.org:
     image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/obnam/summain
+    source: ~/pers/obnam/obnam.org/src
     publish_artifacts: true
-    pre_plan:
-      - action: cargo_fetch
     plan:
-      - action: rustup_setup
-      - action: cargo_clippy
-      - action: cargo_build
-      - action: cargo_test
       - action: shell
         shell: |
-          export PATH="/root/.cargo/bin:$PATH"
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
-          V="$(dpkg-parsechangelog -SVersion | sed 's/-[^-]*$//')"
-          T="$(date -u "+%Y%m%dT%H%M%S")"
-          version="$V.ci$T-1"
-          dch -v "$version" "CI build under Ambient."
-          dch -r ''
-      - action: deb
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
 
   pathdedup:
     image: ~/tmp/ambient/ambient-boot.qcow2
@@ -162,6 +276,30 @@ projects:
           dch -r ''
       - action: deb
 
+  puomi.liw.fi:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/pers/puomi/puomi.liw.fi/src
+    publish_artifacts: true
+    plan:
+      - action: shell
+        shell: |
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+
+  riki.liw.fi:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/pers/riki/riki.liw.fi/src
+    publish_artifacts: true
+    plan:
+      - action: shell
+        shell: |
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+
   sshca:
     image: ~/tmp/ambient/ambient-boot.qcow2
     source: ~/pers/sshca/git
@@ -184,29 +322,17 @@ projects:
           dch -r ''
       - action: deb
 
-  subplot-libdocs:
+  sshca.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/subplot/git
+    source: ~/pers/sshca/sshca.liw.fi/src
     publish_artifacts: true
-    pre_plan:
-      - action: cargo_fetch
     plan:
-      - action: rustup_setup
-      - action: cargo_build
       - action: shell
         shell: |
-          ./check doc
-          cd test-outputs/libdocs
-          find -ls
-          for md in *.md; do
-              pandoc \
-                  --standalone \
-                  --self-contained \
-                  "$md" \
-                  -o "$(basename "$md" .md)".html
-          done
-          find -ls
-          mv *.html /workspace/artifacts/.
+          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
+          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+
+          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
 
   subplot:
     image: ~/tmp/ambient/ambient-boot.qcow2
@@ -232,6 +358,31 @@ projects:
 
       - action: deb
 
+  subplot-libdocs:
+    image: ~/tmp/ambient/ambient-boot.qcow2
+    source: ~/pers/subplot/git
+    publish_artifacts: true
+    pre_plan:
+      - action: cargo_fetch
+    plan:
+      - action: rustup_setup
+      - action: cargo_build
+      - action: shell
+        shell: |
+          ./check doc
+          cd test-outputs/libdocs
+          find -ls
+          for md in *.md; do
+              pandoc \
+                  --standalone \
+                  --self-contained \
+                  "$md" \
+                  -o "$(basename "$md" .md)".html
+          done
+          find -ls
+          mv *.html /workspace/artifacts/.
+
+  # DISABLED until it no longer requires Pandoc.
   # subplot-web:
   #   image: ~/tmp/ambient/ambient-boot.qcow2
   #   source: ~/pers/subplot/subplot-web/src/
@@ -244,77 +395,27 @@ projects:
 
   #         ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
 
-  ambient-web:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/ambient-ci/ambient-web/src/
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
-
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  ewww.liw.fi:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/ewww/ewww.liw.fi/src
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
-
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  obnam.org:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/obnam/obnam.org/src
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
-
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  puomi.liw.fi:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/puomi/puomi.liw.fi/src
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
-
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  riki.liw.fi:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/riki/riki.liw.fi/src
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
-
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  sshca.liw.fi:
+  summain:
     image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/sshca/sshca.liw.fi/src
+    source: ~/pers/obnam/summain
     publish_artifacts: true
+    pre_plan:
+      - action: cargo_fetch
     plan:
+      - action: rustup_setup
+      - action: cargo_clippy
+      - action: cargo_build
+      - action: cargo_test
       - action: shell
         shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
+          export PATH="/root/.cargo/bin:$PATH"
 
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
+          V="$(dpkg-parsechangelog -SVersion | sed 's/-[^-]*$//')"
+          T="$(date -u "+%Y%m%dT%H%M%S")"
+          version="$V.ci$T-1"
+          dch -v "$version" "CI build under Ambient."
+          dch -r ''
+      - action: deb
 
   v-i.liw.fi:
     image: ~/tmp/ambient/ambient-boot.qcow2
@@ -351,103 +452,3 @@ projects:
           sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
 
           ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  256.liw.fi:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/sites/256.liw.fi/src
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
-
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  ick.liw.fi:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/sites/ick.liw.fi/src
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
-
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  liw.fi:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/sites/liw.fi/src
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
-
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  manifesto.liw.fi:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/sites/manifesto.liw.fi/src
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
-
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  noir.liw.fi:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/sites/noir.liw.fi/src
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup
-          sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup
-
-          ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose
-
-  gtdfh.liw.fi:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/sites/gtdfh.liw.fi/src
-    publish_artifacts: true
-    plan:
-      - action: shell
-        shell: |
-          make
-          cp gtdfh.html /workspace/artifacts/index.html
-
-  clab:
-    image: ~/tmp/ambient/ambient-boot.qcow2
-    source: ~/pers/clab/git
-    publish_artifacts: true
-    pre_plan:
-      - action: cargo_fetch
-    plan:
-      - action: rustup_setup
-      - action: cargo_clippy
-      - action: cargo_build
-      - action: cargo_test
-      - action: shell
-        shell: |
-          export PATH="/root/.cargo/bin:$PATH"
-          subplot codegen clab.subplot -o test.py
-          rm -f test.log
-          if ! python3 test.py --log test.log; then
-              cat test.log
-              exit 1
-          fi
-          rm -f test.log test.py
-          git status --ignored
-
-          V="$(dpkg-parsechangelog -SVersion | sed 's/-[^-]*$//')"
-          T="$(date -u "+%Y%m%dT%H%M%S")"
-          version="$V.ci$T-1"
-          dch -v "$version" "CI build under Ambient."
-          dch -r ''
-      - action: deb
diff --git a/bashrc b/bashrc
index 83936b9..c0fecfc 100644
--- a/bashrc
+++ b/bashrc
@@ -216,3 +216,6 @@ fi
 if command -v pathdedup >/dev/null; then
 	PATH="$(pathdedup)"
 fi
+
+# Added by Radicle.
+export PATH="$PATH:/home/liw/.radicle/bin"
diff --git a/ssh/config-pers b/ssh/config-pers
index 34db3b1..86a4082 100644
--- a/ssh/config-pers
+++ b/ssh/config-pers
@@ -1,5 +1,8 @@
 # SSH client configuration for my personal use.
 
+Host shell.infrafish.uk localhost
+    IdentityFile ~/.ssh/non-u2f-key/id_personal
+
 Host remy2
     Hostname 10.3.1.62
     IdentityFile ~/.ssh/id_remarkable
@@ -42,7 +45,7 @@ Host liwphone
     IdentityFile ~/.ssh/id_personal
     PasswordAuthentication yes
 
-Host shell-shell.vm.liw.fi
+Host shell-shell.vm.liw.fi pieni.net
     IdentityFile ~/.ssh/non-u2f-key/id_personal
     UserKnownHostsFile ~/.ssh/known_hosts
     StrictHostKeyChecking yes
@@ -71,4 +74,4 @@ Host *-dev holywood2
     IdentityFile ~/.ssh/non-u2f-key/id_personal
 
 Host *
-    IdentityFile ~/.ssh/non-u2f-key/id_personal
+     IdentityFile ~/.ssh/non-u2f-key/id_personal