From 81603162a1088d7581394c417474750b5ef7dca6 Mon Sep 17 00:00:00 2001 From: jolheiser Date: Sun, 24 Mar 2024 09:48:49 -0500 Subject: [PATCH] feat: tandoor recipes app on dragonwell Signed-off-by: jolheiser --- .git-age.yaml | 2 ++ .gitattributes | 1 + machines/dragonwell/caddy.nix | 9 ++++----- machines/dragonwell/default.nix | 2 +- machines/dragonwell/dex.nix | Bin 1643 -> 1934 bytes machines/dragonwell/tandoor.nix | Bin 0 -> 897 bytes secrets/personal/dex-tandoor.age | 11 +++++++++++ secrets/secrets.nix | 1 + 8 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 machines/dragonwell/tandoor.nix create mode 100644 secrets/personal/dex-tandoor.age diff --git a/.git-age.yaml b/.git-age.yaml index 9b0fe6b..36c769f 100644 --- a/.git-age.yaml +++ b/.git-age.yaml @@ -4,5 +4,7 @@ machines/common/cifs.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 machines/dragonwell/dex.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 +machines/dragonwell/tandoor.nix: + - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 machines/dragonwell/vikunja.nix: - age105cm5awxxegyrqthh4vhnxzr0tdy86q8uq52wkkjacfkutp2vprqwseak7 diff --git a/.gitattributes b/.gitattributes index 7fa6de1..ff02440 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,3 +3,4 @@ apps/gui/firefox/work.nix filter=git-age diff=git-age machines/common/cifs.nix filter=git-age diff=git-age machines/dragonwell/dex.nix filter=git-age diff=git-age machines/dragonwell/vikunja.nix filter=git-age diff=git-age +machines/dragonwell/tandoor.nix filter=git-age diff=git-age diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index 51099ae..1d66c9c 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -1,8 +1,4 @@ -{ - pkgs, - config, - ... -}: { +{pkgs, ...}: { services.caddy = { enable = true; virtualHosts = { @@ -59,6 +55,9 @@ "todo.jolheiser.com".extraConfig = '' reverse_proxy localhost:8636 ''; + "recipes.jolheiser.com".extraConfig = '' + reverse_proxy localhost:3663 + ''; }; }; } diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index 7c2af48..9ba2714 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -2,7 +2,7 @@ let username = "jolheiser"; key = ''ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDfKqCWtDlS3tgvfT6hQN+ii8UtabIZ+ZNmYN+bLwIa8PHOEW5MbfaqXSlhKkSi4+7SfQDCHphw0SMfhsQ4qMEcoywZ+4niDgKlQEVkl+S/VGbLuPe92NRStkyreZBLPr3Rh7ScNlGHcmHmoV9v7725fMnsMmabGVhpGO84PwNHOfJyv2tx2h6LxFbAV8S44UQu2lc8YLWCK2UvKuRnBerBXLnDQThUUX8UuCFzb786gQzD5XDU0MENbByxiy0XdVGAC+tFXEiSIgFZlFbFYyShgdTP9MzX2MOglEi+ae+1UIFncraW7ptUey7qHFJylpHWWWvE+GTwsg2G50i0FvFj jolheiser@jolheiser''; in { - imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./vikunja.nix ./hardware.nix]; + imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./tandoor.nix ./ugit.nix ./vikunja.nix ./hardware.nix]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/machines/dragonwell/dex.nix b/machines/dragonwell/dex.nix index e81503c84cd01ecef1856b97165562e540d3da05..aa5a673bf95dc124dec800dd61b90b830434a4fc 100644 GIT binary patch delta 1923 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 diff --git a/machines/dragonwell/tandoor.nix b/machines/dragonwell/tandoor.nix new file mode 100644 index 0000000000000000000000000000000000000000..efc40612cf2e6e88cc44a601151a0b70b4bdcf5f GIT binary patch literal 897 zcmV-{1AhErXJsvAZewzJaCB*JZZ2lBQ86%bLr8i%SYgr0RRyQ&>V?=9OdQUJbPj*6aQD!%9 zaByo>D^WyiOj21nacEjXYdA<+RX7SQEiE8VP)Q zWvMi_@f>hAkL8dBbF4(_dL7aqa4=ul$2f3e)+Ds_AxEHhxD&-L|8Vsw14}k>sBFKZ zL4*__C5|Qei?rs?4MP(XqJxHyHI@B=@KC#V8%%iofcst$LY!`KBJ9FOA`%)JA6a+5 z@Z|)^b4CSLJ_5~Zm(b5Agd`er18Q(KDx(M7ry$5S%6YH(J&gQAJV z@!cq*(Pei&v)SHFT15pMj<@UURN5;NZWzH%Ol@<{I@`fNOu)kBy0hgRrFT#5F~odb zNgU&~wcDidt4#N&34=4aO(qj8as=4AGpV@5tcmn`2P`9p)*0ygzH#Jvj2TNUS!7## zlx+|oEN>BkJ2Yav?8mwRbSB`0oU6BD(a5f3?S}+d zrvm4!Prt@{JS4P<#~Bc4MgjDXxr`a7PvsY6&tiYskUkUwrpFPt!ktT;>0GGuY0_0! z69W&;AZFsZ#UXwaxoLVsk~tET=i-yB(s!z%&!nyOGcTx`SFo#0CPAaN4xCcmi|8*{ zMOsV=am2ePg`};yt3jC2LrKh5X_n_qs73RQ ssh-ed25519 E8j6/g KP8adYt7yepYjV1WCWB2k37H11nZS0syTPO6PVucDQ4 +nd9usbx1lF7W2NoRyBmdU+TkYw42yPc5+YLHPvFgf1U +-> ssh-ed25519 f31uNA 7VqN325Bduh25YchTA9x4fTSRd41a2YaVvDdLpwLpDQ +CqwaGdHTEgYBMAPu90iepQ49xYaWHG0FgstoW26nvx8 +-> =8c+@%-grease w_5b {U1m1b74 pok2 2(-Tc:-s +rOOI5rguWr1j4qgZ2pU46+aeXkrO4nj98K5haK31Cxa8dpWpX9griaZZY2yK9t90 +gREWgA+FELyBNadX +--- UsjsNVNstM008feyUFwjzDmO99vtJLO6V2/LjjErUX8 +om-`w*q+G :?{܄ +IV Ne~+ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index de8302d..1b7aeb0 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -27,4 +27,5 @@ in { "personal/dex.age".publicKeys = [jolheiser dragonwell]; "personal/dex-tailscale.age".publicKeys = [jolheiser dragonwell]; "personal/dex-vikunja.age".publicKeys = [jolheiser dragonwell]; + "personal/dex-tandoor.age".publicKeys = [jolheiser dragonwell]; }