From b120f59cf9ba15f093fb6b0ad259212f143e5c24 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Tue, 10 Jan 2023 22:27:47 +1000 Subject: [PATCH] add taskwarrior secrets + keys to config --- home/profiles/task/ca.cert | 29 +++++++++++++++++++++++++++ home/profiles/task/default.nix | 2 ++ home/profiles/task/public.cert | 31 +++++++++++++++++++++++++++++ home/profiles/task/taskrc | 2 +- hosts/profiles/desktop/default.nix | 4 ++++ secrets/secrets.nix | 3 ++- secrets/taskwarrior-private.age | Bin 0 -> 3730 bytes 7 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 home/profiles/task/ca.cert create mode 100644 home/profiles/task/public.cert create mode 100644 secrets/taskwarrior-private.age diff --git a/home/profiles/task/ca.cert b/home/profiles/task/ca.cert new file mode 100644 index 00000000..6bc767ba --- /dev/null +++ b/home/profiles/task/ca.cert @@ -0,0 +1,29 @@ +-----BEGIN CERTIFICATE----- +MIIE/zCCAuegAwIBAgIUTLEuHYBh/sST/IrIhs+pWjDjW3UwDQYJKoZIhvcNAQEM +BQAwFjEUMBIGA1UEAxMLMTkyLjE2OC4xLjYwIBcNMjEwMjEzMDUzODUxWhgPOTk5 +OTEyMzEyMzU5NTlaMBYxFDASBgNVBAMTCzE5Mi4xNjguMS42MIICIjANBgkqhkiG +9w0BAQEFAAOCAg8AMIICCgKCAgEA8ZyNGBoudva5KAe1F281Fe3u91whLPB7SWv4 +zvN6n81NaMtl+rkfcO5GrYSbtemeQUz04N9dUIRABPyHGO+y0gQn/1p1KMdFzhH1 +wDR45h/Eo7+U+2Y/qjyvdjNU9aPe5yymuqSm0cTdFbRkXBoZDSDrwA0U078oYCBo +yDxubKK7H7jWlSVyaBmsWDA72qdZhcOGKy6YoIEiT18V/57wTXBacBZvs3ORbOR6 +SMPjq0Pr32+kDriRbb9lQ9TAAGLE51hM8IBMnAZVvgS5GQ1y8elH4WJc7caom5B3 +l1MVQKEtgxU+QA4ZqGr9y7H4ey4Xf0V9pvrnsUTu1zCz+P4wd8jS6toxCnn8A8Tq +c3ytA7t3o7BntLSWeQV5LKEiXqF3n3njqXk5Z0ZxDkI+FkhbnOytwGvUEpanTS1d +z3EyZA8h1huoDdTmL1hVrg9pIaFJG5S9GuwcJiFPFo0QN6lcbhJmKrCOzPKb8Kwn +zhymN7vtskSeqPZnQX+/tGupMzeITwcudoBg7zRUNKikIsTwFze+QV+puGFCjH+B +BIe0NQ+rzpWOyI7FDYIMb5q+/PJKTkH2Bu5qYhgebzdCxKcJGBNoWsgzvl+tofQw +XchzIqR35xbkmvLeuIIABd8BKaowrAUGrRxtp7IZqxcR3XxH1RIimkHzeRHTphU2 +oycB3eMCAwEAAaNDMEEwDwYDVR0TAQH/BAUwAwEB/zAPBgNVHQ8BAf8EBQMDBwQA +MB0GA1UdDgQWBBQBl2OoCoAweUqsfVQNmL9H3jtl2DANBgkqhkiG9w0BAQwFAAOC +AgEAypV1zutIu7an9tansll20LH2WMAHqi5JrALPBCO9yTqnCS3xZg8VZott/qxm +/SsdlhKtekpvljiQhKqB4wROTf26GjxB9iAzdfxAZEcpYWkyXQ6qzDpjIHLLB3X2 +31KHbMc63GOI4wmpGY532tt3qDb+VhgfK25GyvUvvw5qvFsYeGHdSD/HIEJHKlOK +8esaF2/r+wuOWABbbmSBaCtR8H8T4Z/B5l6PoVft9uu8IQbtuhiDn08mZHat8tUq +nxm3O1JsV4ZNtvqh5st1Qn32f7buM6AFMhMy9bcXwR33TJBuv994zRjJQYk+FKzE +UzrWl9mlglWV34P0+xMxpDFEgQvkJAFmdhcVsZlDwILWzEa/ZrS2EQGsEuzHbfFo +oVQuXjzQkX504kAypwQBwbqPfwwYEev7EPVOj32/ke1TzBLaqqJ5AMABShOUJD3L +pNOWMD3B23lRDll2f/Tkhqq4qriqWmtn7urC5ga6AlnAUueiORHTTcA9XBuAz68q +dVfU3cIwwnGhDAYUB27yeb0mhPGnTz2Xr4tn8TLrL7c0tXZPjDCttr6hUnB+X/Yx +tBxT1fJMZR7lzRMvnLJJQKC5rVKE4AAy+FJb3JvhQw01CF4odCmgWT3y+MG4RxnN +sqTWkKoE6bRT9rnRAG8EntRycibGKH0b1PhpY8ngOgMbfCw= +-----END CERTIFICATE----- diff --git a/home/profiles/task/default.nix b/home/profiles/task/default.nix index 4ed0c601..2a2bbb11 100644 --- a/home/profiles/task/default.nix +++ b/home/profiles/task/default.nix @@ -5,5 +5,7 @@ home.file = { ".taskrc".source = ./taskrc; ".local/bin/task-note".source = ./bin/task-note.py; + ".task/keys/ca.cert".source = ./ca.cert; + ".task/keys/public.cert".source = ./public.cert; }; } diff --git a/home/profiles/task/public.cert b/home/profiles/task/public.cert new file mode 100644 index 00000000..a31056f8 --- /dev/null +++ b/home/profiles/task/public.cert @@ -0,0 +1,31 @@ +-----BEGIN CERTIFICATE----- +MIIFRDCCAyygAwIBAgIUCsfV17Ag4utaNHY9sv6x7g/Z3bgwDQYJKoZIhvcNAQEM +BQAwFjEUMBIGA1UEAxMLMTkyLjE2OC4xLjYwIBcNMjEwMjEzMDUzODU0WhgPOTk5 +OTEyMzEyMzU5NTlaMCgxFDASBgNVBAMTCzE5Mi4xNjguMS42MRAwDgYDVQQKEwdt +b3NzbmV0MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA23j6Xo+BlPpM +APbncIztaYOfL02lvCOhbx5sxPk6TH5dIxzkBAc3T9X6uY+hTY36QT+SjN5z0EBi +UghxwMM8r2G4ip3XLEFgyFDuDzVgRRuGBbSGtOEIqt49lvmBEWKaxDdYftdlDpKq +qV8NlQJJnBJ9cNZlWzlheRALHMvCUsfnX60piWbQjYrq6j+lF9VjUKUClD92/jhS +LaeaQ6vMlCabYNOf+vq8J3L2oRwHkLMPHBa/a5vNT3bL8Q/Sjuegi+zD68k/fobt +Y7gYL/qyhrFfIvGyN0Jf92DTKdj+1ma3kIaG+REeAx5W8NtRdfnSlS+DA5O0mp0P +oMZICs0Xbq474XYkhBoz7smWA4DLT86on7qcCo24CvII9YU0VDYHNtnDi8CaStea +dvGFDiQS5X3Awwsgt5OWJSgBx+NL9piiZq9Eu5E3CGpoYNiTCANrRV21qmyf090h +md01QUU/f1IMa+wBgryTW94OUhSMmknB9roFAmQaD9Xnj6ecGJkq2ZiytpJ37QiV +8h2ZM9K1PUD4/QulCG/U4IG1II7ef1IUyEFpj6BB7CGCHq+qJ7QKT6Kc/quEewHB +eUjG+FvSmCCgfVf/hqYvul7ybbiqMgCSTSziKF7tN8DuFfIZo9EGdckKXxBgQ7ua +BRVnSZw2vh8nJ8jtGkrw/grKwHL/yA0CAwEAAaN2MHQwDAYDVR0TAQH/BAIwADAT +BgNVHSUEDDAKBggrBgEFBQcDAjAPBgNVHQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQi +MnF9Np64W1zshqQxe8Cgvm8hFDAfBgNVHSMEGDAWgBQBl2OoCoAweUqsfVQNmL9H +3jtl2DANBgkqhkiG9w0BAQwFAAOCAgEAsNqR/SziOtCRS+n7FGxJ+3FpfACqV4Yl +MDTbpRe0qUcbMDetWZALdPS5gNW/4rj2cpacd3eQI6qRLtUW/l8QGqZl8OjslA2X +/N+9Alza8D+cv6Almx1TclcYJF/Z0NneJ4DgdFXJAPK3zf5eD73N/7EohNWy70Bj +J/4cmYL3T1Pq/FhN/9DV9HoSaRxy9naRjZ3dZXC4CgFRExXw+sEHLDzOHrLDz2xN +4qOjYUH3I1rGWXsSGRFztgNTnA02hPxG1VHzmTvwPjoBxn2/QGTMuXnk8xQGGtdy +G8oav2RLBqvh0AD4fqd2fnMezJiRipXzYmWb1bySe48HRtHJrZ/aQQrUlPdNQwAe +EeixS97JEdBqtag41VhRBFxF9nML8ozA6cgj+Jm2M6OGU+M3tVhioEiuKPm6jXgl +3v8AA2CQrSJjhkTzinxE4FXa9O8INwziHSCE3GNIZaDCMYj7R8tTVcLaQWzUtdj/ +i+0fI61n3ZOabvhLXttsdrtqcfNbrxCBVezoweg2RrVFcJc2GojCwJWt6a0cO+69 +ggHZgpAwXsMmyMhhCbBXhnxBrsuGbN7f3YN2ty2veeFtp8uDvjCqmgJ5AG32w5E4 +Ck9Rup6lwgq3YTQ4pTxl2y26HinobPrMzsZiWkZhN7elnVZL00kSF2Qn6x6xuAap +Z5oPkwZtYnM= +-----END CERTIFICATE----- diff --git a/home/profiles/task/taskrc b/home/profiles/task/taskrc index ba50c335..e45bf060 100644 --- a/home/profiles/task/taskrc +++ b/home/profiles/task/taskrc @@ -15,7 +15,7 @@ data.location=~/.task taskd.server=task.mossnet.lan:53589 #taskd.server=10.0.69.4:53589 taskd.ca=~/.task/keys/ca.cert -taskd.key=~/.task/keys/private.key +taskd.key=/run/secrets/taskwarrior-private taskd.certificate=~/.task/keys/public.cert taskd.trust=ignore hostname taskd.credentials=mossnet\/anish\/1647259c-e340-405c-a38b-11ac18e34688 diff --git a/hosts/profiles/desktop/default.nix b/hosts/profiles/desktop/default.nix index 645d6797..e8120310 100644 --- a/hosts/profiles/desktop/default.nix +++ b/hosts/profiles/desktop/default.nix @@ -28,6 +28,10 @@ in age.secrets.mossnet.file = "${self}/secrets/mossnet.age"; age.secrets.mossnet.owner = "anish"; + # Taskwarrior private key + age.secrets.taskwarrior-private.file = "${self}/secrets/taskwarrior-private.age"; + age.secrets.taskwarrior-private.owner = "anish"; + # We don't plug USBs into servers services.devmon.enable = true; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 89752c80..6b37682a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -7,9 +7,10 @@ let helix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAKrL6IDHNnHmxi0q9nzu87NOyidPm3HpE7klU368lEf root@helix"; curve = [ system user ]; allUserKeys = [ system user mossnet ]; - systemOnly = [ system mossnet lituus helix ]; + systemOnly = [ system mossnet lituus helix ]; in { + "taskwarrior-private.age".publicKeys = curve; "fastmail.age".publicKeys = allUserKeys; "mossnet.age".publicKeys = allUserKeys; "curve-wg.age".publicKeys = curve; diff --git a/secrets/taskwarrior-private.age b/secrets/taskwarrior-private.age new file mode 100644 index 0000000000000000000000000000000000000000..73d728820d04d06963686f053ef0505ef4fe46be GIT binary patch literal 3730 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 literal 0 HcmV?d00001