diff options
| -rw-r--r-- | ambient.yaml | 66 | ||||
| -rw-r--r-- | bashrc | 2 | ||||
| -rw-r--r-- | ssh/config-pers | 27 |
3 files changed, 57 insertions, 38 deletions
diff --git a/ambient.yaml b/ambient.yaml index 7b7dd64..68a3cf6 100644 --- a/ambient.yaml +++ b/ambient.yaml @@ -347,19 +347,6 @@ projects: post_plan: - action: rsync - manifesto.liw.fi: - image: ~/tmp/ambient/ambient-boot.qcow2 - source: ~/sites/manifesto.liw.fi/src - 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 - post_plan: - - action: rsync - noir.liw.fi: image: ~/tmp/ambient/ambient-boot.qcow2 source: ~/sites/noir.liw.fi/src @@ -799,17 +786,26 @@ projects: post_plan: - action: dput - # DISABLED until it no longer requires Pandoc. - # subplot-web: - # image: ~/tmp/ambient/ambient-boot.qcow2 - # source: ~/pers/subplot/subplot-web/src/ - # plan: - # - action: shell - # shell: | - # sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup - # sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup + subplot-web: + image: ~/tmp/ambient/ikiwiki.qcow2 + source: ~/pers/subplot/subplot-web/src/ + plan: + - action: shell + shell: | + export HOME=/root + + sed -i 's#^srcdir:.*#srcdir: /workspace/src#' ikiwiki.setup + sed -i 's#^destdir:.*#destdir: /workspace/artifacts#' ikiwiki.setup + + rm -rf .ikiwiki + mkdir .ikiwiki + mv /workspace/cache/* .ikiwiki/. + + ikiwiki --setup ikiwiki.setup --libdir $HOME/.ikiwiki --rebuild --verbose - # ikiwiki --setup ikiwiki.setup --libdir /workspace/deps --rebuild --verbose + mv .ikiwiki/* /workspace/cache/. + post_plan: + - action: rsync summain: image: ~/tmp/ambient/ambient-boot.qcow2 @@ -980,3 +976,27 @@ projects: post_plan: - action: rsync + + wumpus-hunter: + image: ~/tmp/ambient/ambient-boot.qcow2 + source: ~/radicle/wumpus + pre_plan: + - action: cargo_fetch + plan: + - action: cargo_fmt + - action: cargo_clippy + - action: cargo_build + - action: cargo_test + - action: shell + shell: | + export DEBEMAIL=liw@liw.fi + export DEBFULLNAME="Lars Wirzenius" + + 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 + post_plan: + - action: dput @@ -166,7 +166,7 @@ if command -v emacs >/dev/null; then else export EDITOR=vi fi -export PATH="$HOME/.cargo/bin:$PATH:$HOME/bin:$HOME/.local/bin:$HOME/.radicle/bin:/usr/bin/games" +export PATH="$HOME/.cargo/bin:$PATH:$HOME/bin:$HOME/.local/bin:$HOME/.radicle/bin:/usr/games" export PAGER=less export LESSCHARSET=utf-8 export HISTCONTROL=ignoredups diff --git a/ssh/config-pers b/ssh/config-pers index 17909bd..3d5aa36 100644 --- a/ssh/config-pers +++ b/ssh/config-pers @@ -1,7 +1,7 @@ # SSH client configuration for my personal use. Host shell.infrafish.uk localhost - IdentityFile ~/.ssh/non-u2f-key/id_personal + IdentityFile ~/.ssh/id_personal Host remy2 Hostname 10.3.1.62 @@ -13,30 +13,29 @@ Host meet.liw.fi radicle.liw.fi wumpus.liw.fi seed.liw.fi monitor.liw.fi Host codeberg.org IdentityFile ~/.ssh/id_codeberg -Host irc.liw.fi +Host irc.liw.fi apt.liw.fi web IdentityFile ~/.ssh/id_hetzner - -Host apt.liw.fi - IdentityFile ~/.ssh/non-u2f-key/id_personal +# IdentityFile /home/liw/pers/ansibleness/ansible/ambient-driver-apt + IdentitiesOnly yes Host ci-prod-controller.vm.liw.fi - IdentityFile ~/.ssh/non-u2f-key/id_personal + IdentityFile ~/.ssh/id_personal Host icktool image-dist UserKnownHostsFile /dev/null StrictHostKeyChecking accept-new - IdentityFile ~/.ssh/non-u2f-key/id_personal + IdentityFile ~/.ssh/id_personal Host workera UserKnownHostsFile /dev/null StrictHostKeyChecking accept-new - IdentityFile ~/.ssh/non-u2f-key/id_personal + IdentityFile ~/.ssh/id_personal Host qotom - IdentityFile ~/.ssh/non-u2f-key/id_personal + IdentityFile ~/.ssh/id_personal Host obnam-server - IdentityFile ~/.ssh/non-u2f-key/id_personal + IdentityFile ~/.ssh/id_personal Host liwphone Hostname 10.1.1.83 @@ -46,7 +45,7 @@ Host liwphone PasswordAuthentication yes Host shell-shell.vm.liw.fi pieni.net - IdentityFile ~/.ssh/non-u2f-key/id_personal + IdentityFile ~/.ssh/id_personal UserKnownHostsFile ~/.ssh/known_hosts StrictHostKeyChecking yes @@ -65,13 +64,13 @@ Host atuin.liw.fi nalanda.liw.fi sq-test.liw.fi Host git.liw.fi git-git.vm.liw.fi Port 12765 - IdentityFile ~/.ssh/non-u2f-key/id_personal + IdentityFile ~/.ssh/id_personal Host salsa.debian.org IdentityFile ~/.ssh/id_salsa Host *-dev holywood2 - IdentityFile ~/.ssh/non-u2f-key/id_personal + IdentityFile ~/.ssh/id_personal Host * - IdentityFile ~/.ssh/non-u2f-key/id_personal + IdentityFile ~/.ssh/id_personal |