diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index ab46971757fa3afd732523bebdb787905c57c50c..5169210a8785e39d2131179a12145e1e83957ab3 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -59,12 +59,6 @@ reverse_proxy localhost:2884 ''; }; virtualHosts = { - virtualHosts = { - extraConfig = '' - reverse_proxy localhost:2423 - ''; - }; - virtualHosts = { extraConfig = '' }; } diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index c486c4d7f8e758fe274e07b8b300bf64d734a7b2..dc6edda73bf53169d7415c76a360d0fbcf5eb0d5 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 ./jenkins.nix ./restic.nix ./ugit.nix ./hardware.nix]; + imports = [./caddy.nix ./dex.nix ./golink.nix ./gotosocial.nix ./restic.nix ./ugit.nix ./hardware.nix]; boot.tmp.cleanOnBoot = true; zramSwap.enable = true; diff --git a/machines/dragonwell/jenkins.nix b/machines/dragonwell/jenkins.nix deleted file mode 100644 index d9b4d67424a844332b673a96bd10a28c5b923eff..0000000000000000000000000000000000000000 --- a/machines/dragonwell/jenkins.nix +++ /dev/null @@ -1,23 +0,0 @@ -{config, ...}: { - age.secrets.jenkins.file = ../../secrets/personal/jenkins.age; - services.jenkins = { - enable = true; - listenAddress = "localhost"; - port = 2423; - jobBuilder = { - accessTokenFile = config.age.secrets.jenkins.path; - nixJobs = [ - { - job = { - name = "echo"; - builders = [ - { - shell = "echo 'Hello, world!'"; - } - ]; - }; - } - ]; - }; - }; -} diff --git a/secrets/personal/jenkins.age b/secrets/personal/jenkins.age deleted file mode 100644 index 285b673932dc38141911ee455ecddf9a2c442379..0000000000000000000000000000000000000000 --- a/secrets/personal/jenkins.age +++ /dev/null @@ -1,11 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 E8j6/g AJiLqqUpu/SLAFvz6EXvZ6o1PXa1DrcBjf94gpEFq10 -ZYHjqsJ8tVer0YlJvJ11XQYx6P8FlB5Nj8Gr4BYZlCw --> ssh-ed25519 f31uNA 0iFxySw9nqD6uhCyFTND0cNLAWnAcKVDhbP5dzizXGk -lr/gjZxUP0Ta8cRw24Zf26TLQmw+fRlElPqZvXR5d9g --> @>-grease -0Y9PU1g/9/KPNt0XjFcHHsL36Txo/gKyedRC524UAu/OpX6Ob8TDN1DOKvlG9HQN -cmcvJ5sKHDfh0MCef1FnZM2vhSxINm/WE2AYpjs ---- 6RV0T/JXRFKZDzFFtqFTjLIdZTETLW6MVRcuHqz5tkw - 6CWJ\?0/;®I Ϭp -׃jUQh \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 327e423892416eb63d6b7be0a4c2963bd646bfc1..ae3e5b2acce8e5e2dc5fa5fe3cdb473e1a65aae4 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -26,6 +26,4 @@ "personal/restic-repo.age".publicKeys = [jolheiser dragonwell]; "personal/dex.age".publicKeys = [jolheiser dragonwell]; "personal/dex-tailscale.age".publicKeys = [jolheiser dragonwell]; jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS"; - dragonwell = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN32Cwxer2AOGvEqSqXSPp49gj1VtR7G2XmPnmXj6o53"; - jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS";