From 2470ea35b8cbb968f92a6c1beacebd8a65ecf51f Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Thu, 22 Oct 2020 23:30:09 -0700 Subject: iris -> melete as workstation --- .config/cron/spwhitton_iris.silentflame.com | 7 ------ .config/cron/spwhitton_melete.silentflame.com | 7 ++++++ .duply/iris-spwhitton-home/conf | 25 ------------------- .duply/iris-spwhitton-home/exclude | 35 --------------------------- .duply/melete-spwhitton-home/conf | 21 ++++++++++++++++ .duply/melete-spwhitton-home/exclude | 35 +++++++++++++++++++++++++++ .emacs.d/init-org.el | 4 +-- .mrconfig.in | 4 +-- .ssh/config | 4 +++ .ssh/host.d/spwhitton_melete.silentflame.com | 2 ++ bin/i3-startup-once | 2 +- bin/locmaint | 2 +- 12 files changed, 75 insertions(+), 73 deletions(-) delete mode 100644 .config/cron/spwhitton_iris.silentflame.com create mode 100644 .config/cron/spwhitton_melete.silentflame.com delete mode 100644 .duply/iris-spwhitton-home/conf delete mode 100644 .duply/iris-spwhitton-home/exclude create mode 100644 .duply/melete-spwhitton-home/conf create mode 100644 .duply/melete-spwhitton-home/exclude create mode 100644 .ssh/host.d/spwhitton_melete.silentflame.com diff --git a/.config/cron/spwhitton_iris.silentflame.com b/.config/cron/spwhitton_iris.silentflame.com deleted file mode 100644 index 55c0bd01..00000000 --- a/.config/cron/spwhitton_iris.silentflame.com +++ /dev/null @@ -1,7 +0,0 @@ -PATH=$HOME/local/bin:$HOME/.local/bin:$HOME/src/dotfiles/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin - -*/15 * * * * chronic doccheckin -# iris has an SSD so we can check mail more often -*/5 * * * * chronic nice ionice -c 3 notmuch new - -*/5 * * * * chronic nice ionice -c 3 workstation-duplicity diff --git a/.config/cron/spwhitton_melete.silentflame.com b/.config/cron/spwhitton_melete.silentflame.com new file mode 100644 index 00000000..015c1d33 --- /dev/null +++ b/.config/cron/spwhitton_melete.silentflame.com @@ -0,0 +1,7 @@ +PATH=$HOME/local/bin:$HOME/.local/bin:$HOME/src/dotfiles/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin + +*/15 * * * * chronic doccheckin +# melete has an SSD so we can check mail more often +*/5 * * * * chronic nice ionice -c 3 notmuch new + +*/5 * * * * chronic nice ionice -c 3 workstation-duplicity diff --git a/.duply/iris-spwhitton-home/conf b/.duply/iris-spwhitton-home/conf deleted file mode 100644 index 8a6c5e57..00000000 --- a/.duply/iris-spwhitton-home/conf +++ /dev/null @@ -1,25 +0,0 @@ -# to get documentation on these options, run "duply sample create" and -# you'll find a fully-commented configuration file in -# ~/.duply/sample/conf - -. "$HOME/local/auth/duply/iris-spwhitton-home" - -#GPG_TEST='disabled' - -# we backup iris to S3 rather than rsync.net because iris roams -# between WiFi networks, and so we want duplicity to backup over HTTP, -# so backups can go ahead when SSH ports are blocked -TARGET='s3://s3.amazonaws.com/iris-spwhitton-home/' - -SOURCE='/' -FILENAME='.duplicity-ignore' -DUPL_PARAMS="$DUPL_PARAMS --exclude-if-present '$FILENAME'" -MAX_AGE=4M -MAX_FULL_BACKUPS=2 -MAX_FULLBKP_AGE=1M -DUPL_PARAMS="$DUPL_PARAMS --full-if-older-than $MAX_FULLBKP_AGE " -#VERBOSITY=5 -#TEMP_DIR=/tmp -DUPL_PARAMS="$DUPL_PARAMS --asynchronous-upload " -#DUPL_PARAMS="--log-file /var/log/duplicity.log " -DUPL_PARAMS="$DUPL_PARAMS --s3-use-new-style --s3-unencrypted-connection --s3-use-multiprocessing " diff --git a/.duply/iris-spwhitton-home/exclude b/.duply/iris-spwhitton-home/exclude deleted file mode 100644 index c05ad005..00000000 --- a/.duply/iris-spwhitton-home/exclude +++ /dev/null @@ -1,35 +0,0 @@ -- /home/spwhitton/lib/annex/.git/annex -- /home/spwhitton/annex/.git/annex -- /home/spwhitton/lib/athena-apt/pool -- /home/spwhitton/lib/dionysus/.git/annex/objects -- /home/spwhitton/lib/rt -- /home/spwhitton/lib/debconf-share -- /home/spwhitton/.fmail/.notmuch -- /home/spwhitton/.fmail/annex -- /home/spwhitton/local/rt -- /home/spwhitton/local/big -- /home/spwhitton/local/debuild -- /home/spwhitton/local/ubuntu -- /home/spwhitton/lib/oc -- /home/spwhitton/lib/Dropbox -- /home/spwhitton/lib/fm -- /home/spwhitton/.cabal -- /home/spwhitton/.stack -- /home/spwhitton/.cache -- /home/spwhitton/VirtualBox VMs -- /home/spwhitton/local/mairixdb -- /home/spwhitton/.thumbnails -- /home/spwhitton/mnt -- /home/spwhitton/.docsets -- /home/spwhitton/src/DHG_packages/lab -- /home/spwhitton/.var/app -- /home/spwhitton/snap -- **.cabal-sandbox** -- **.stack-work** -- **docsets** -- **/.git/dgit/** -- **/dist/build/** -+ /home/spwhitton -+ /home/spw/src -+ /home/spw/tmp -- ** diff --git a/.duply/melete-spwhitton-home/conf b/.duply/melete-spwhitton-home/conf new file mode 100644 index 00000000..15afad8d --- /dev/null +++ b/.duply/melete-spwhitton-home/conf @@ -0,0 +1,21 @@ +# to get documentation on these options, run "duply sample create" and +# you'll find a fully-commented configuration file in +# ~/.duply/sample/conf + +. "$HOME/local/auth/duply/melete-spwhitton-home" + +#GPG_TEST='disabled' + +TARGET='rsync://19371@ch-s012.rsync.net/duply/melete-spwhitton-home/' +SOURCE='/' +FILENAME='.duplicity-ignore' +DUPL_PARAMS="$DUPL_PARAMS --exclude-if-present '$FILENAME'" +MAX_AGE=4M +MAX_FULL_BACKUPS=2 +MAX_FULLBKP_AGE=1M +DUPL_PARAMS="$DUPL_PARAMS --full-if-older-than $MAX_FULLBKP_AGE " +#VERBOSITY=5 +#TEMP_DIR=/tmp +DUPL_PARAMS="$DUPL_PARAMS --asynchronous-upload " +#DUPL_PARAMS="--log-file /var/log/duplicity.log " +DUPL_PARAMS="--rsync-options \"--rsh=\\\"ssh -oBatchMode=yes -oControlMaster=no -oControlPath=none -oIdentitiesOnly=yes -i $HOME/.ssh/id_19371@ch-s012.rsync.net\\\" \" " diff --git a/.duply/melete-spwhitton-home/exclude b/.duply/melete-spwhitton-home/exclude new file mode 100644 index 00000000..c05ad005 --- /dev/null +++ b/.duply/melete-spwhitton-home/exclude @@ -0,0 +1,35 @@ +- /home/spwhitton/lib/annex/.git/annex +- /home/spwhitton/annex/.git/annex +- /home/spwhitton/lib/athena-apt/pool +- /home/spwhitton/lib/dionysus/.git/annex/objects +- /home/spwhitton/lib/rt +- /home/spwhitton/lib/debconf-share +- /home/spwhitton/.fmail/.notmuch +- /home/spwhitton/.fmail/annex +- /home/spwhitton/local/rt +- /home/spwhitton/local/big +- /home/spwhitton/local/debuild +- /home/spwhitton/local/ubuntu +- /home/spwhitton/lib/oc +- /home/spwhitton/lib/Dropbox +- /home/spwhitton/lib/fm +- /home/spwhitton/.cabal +- /home/spwhitton/.stack +- /home/spwhitton/.cache +- /home/spwhitton/VirtualBox VMs +- /home/spwhitton/local/mairixdb +- /home/spwhitton/.thumbnails +- /home/spwhitton/mnt +- /home/spwhitton/.docsets +- /home/spwhitton/src/DHG_packages/lab +- /home/spwhitton/.var/app +- /home/spwhitton/snap +- **.cabal-sandbox** +- **.stack-work** +- **docsets** +- **/.git/dgit/** +- **/dist/build/** ++ /home/spwhitton ++ /home/spw/src ++ /home/spw/tmp +- ** diff --git a/.emacs.d/init-org.el b/.emacs.d/init-org.el index 019a9e72..61959f14 100644 --- a/.emacs.d/init-org.el +++ b/.emacs.d/init-org.el @@ -465,9 +465,9 @@ different occasions." (spw/skip-when (or ;; #1 - ;; iris is a laptop, but usually it's not in Sheffield + ;; melete is a laptop, but usually it's not in Sheffield (and (or - (string= (system-name) "iris") + (string= (system-name) "melete") (string= (system-name) "hephaestus")) (member "@Sheffield" (org-get-tags))) ;; #2 diff --git a/.mrconfig.in b/.mrconfig.in index 0c43a19a..8c7c5af5 100644 --- a/.mrconfig.in +++ b/.mrconfig.in @@ -82,13 +82,13 @@ lib = return 1 } workstation() { - on swhitton@zephyr spwhitton@hephaestus spwhitton@iris + on swhitton@zephyr spwhitton@hephaestus spwhitton@melete } mine() { workstation || on spwhitton@athena } # tucson() { - # on artemis shortgeese athena hephaestus iris + # on artemis shortgeese athena hephaestus iris melete # } # --- run a command on athena in a sane environment diff --git a/.ssh/config b/.ssh/config index 21246f82..38bf76d8 100644 --- a/.ssh/config +++ b/.ssh/config @@ -108,6 +108,10 @@ Host iris.silentflame.com | iris User spwhitton ForwardAgent yes +Host melete.silentflame.com | melete +User spwhitton +ForwardAgent yes + ### other people's hosts Host github diff --git a/.ssh/host.d/spwhitton_melete.silentflame.com b/.ssh/host.d/spwhitton_melete.silentflame.com new file mode 100644 index 00000000..02471770 --- /dev/null +++ b/.ssh/host.d/spwhitton_melete.silentflame.com @@ -0,0 +1,2 @@ +swhitton@artemis-2015-08-15 +user@zephyr-2018-08-09 diff --git a/bin/i3-startup-once b/bin/i3-startup-once index 09f1afa1..6c297fe2 100755 --- a/bin/i3-startup-once +++ b/bin/i3-startup-once @@ -17,7 +17,7 @@ # ---- xrandr on specific hosts # this relies on having set the video device to 'virtio' in virt-manager -if [ "$(hostname -f)" = "develacc.iris.silentflame.com" ]; then +if [ "$(hostname -f)" = "develacc.melete.silentflame.com" ]; then xrandr --output Virtual-1 --mode 1366x768 fi diff --git a/bin/locmaint b/bin/locmaint index a3b89746..15b21286 100755 --- a/bin/locmaint +++ b/bin/locmaint @@ -109,7 +109,7 @@ for (getpwuid($<) . '@' . `hostname -f`) { if (/^root@/ or /silentflame\.com$/) { $can_root = 1; } - if (/@(zephyr|iris)\.silentflame\.com$/) { + if (/@(zephyr|melete)\.silentflame\.com$/) { $check_for_extdrive = 1; } } -- cgit v1.2.3