From 1b800757bfe017f62bef3cc4bb4f16abd7538fc7 Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Fri, 25 Mar 2022 08:09:08 -0300 Subject: src/infrastructure/machines.scm: Move relevant FIXME markers to TODOs.md --- TODOs.md | 4 ++-- src/infrastructure/machines.scm | 29 +++-------------------------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/TODOs.md b/TODOs.md index 5824f97..9a8bc13 100644 --- a/TODOs.md +++ b/TODOs.md @@ -17,13 +17,13 @@ Reference: --- - Postfix, SpamAssasin, Dovecot; -- Matrix, Prosody; +- Matrix (Conduit), Prosody; - Git; - NGINX, fcgiwrap; - Prometheus, $LOG_TOOL; - Nextcloud; - Guix; -- DNS, certbot; +- DNS (knot), certbot; - borg; - Litestream. diff --git a/src/infrastructure/machines.scm b/src/infrastructure/machines.scm index 9ebdd82..70e6cb2 100644 --- a/src/infrastructure/machines.scm +++ b/src/infrastructure/machines.scm @@ -24,11 +24,11 @@ ;; $ ssh-keygen ;; - *manually* add that to the authorized_keys on rsync.net: ;; $ scp $R:.ssh/authorized_keys src/rsync.net/ -;; $ # FIXME: add 'restrict,command="..."' to the authorized_keys entry +;; $ # add 'restrict,command="..."' to the authorized_keys entry ;; $ ssh $SERVER cat .ssh/id_rsa.pub >> authorized_keys ;; $ scp src/rsync.net/authorized_keys $R:.ssh/ ;; - copy borg key after the first backup: -;; $ FIXME +;; $ ? ;; - generate DKIM key ;; $ guix shell openssl -- openssl genrsa -out /opt/secrets/dkim.arrobaponto.org.key 1024 ;; $ guix shell openssl -- openssl rsa -in /opt/secrets/dkim.arrobaponto.org.key -pubout -out /opt/secrets/dkim.arrobaponto.org.pub @@ -36,25 +36,6 @@ ;; to ~/.bashrc and ~root/.bashrc ;; -;; -;; Friendly reminder that I've actually installed and configure email + XMPP o -;; a Debian server in Vultr! I just deleted the snapshot that I made in case -;; of restoring, and I deleted it just now to save money and stop paying for it. -;; - -;; -;; TODO (FIXME): -;; - maddy (spamassasin? fail2ban? rspamd? blacklistd?) -;; - dns (knot) -;; - prosody? matrix-conduit? Read again HN comments on Dino 0.3 release. Maybe manage both for a while. -;; - httpd? -;; - -;; -;; FIXME: -;; - resize machine -;; - (define profile-extra (plain-file "profile-extra" #"""- @@ -226,11 +207,7 @@ (define cronjobs (list - #~(job "0 30 * * 0" "guix gc -d 1m -F 10G") - ;; FIXME: wat!? There is a /root/dead.letter file!? - ;; #~(job "* * * * *" "sh /etc/with-email.sh -s '[CRON] toph: xablau' -- seq 10 20 >&1") - #~(job "* * * * *" "whoami") - #~(job "* * * * *" "seq 20 30 >&2"))) + #~(job "0 30 * * 0" "guix gc -d 1m -F 10G"))) (define admin-user "andreh") -- cgit v1.2.3