diff --git a/machines/dragonwell/caddy.nix b/machines/dragonwell/caddy.nix index d374abc3b1d530465ded6508666cb7ddb9024930..68fdeee14cc968bd31143f08df953e639fedabf4 100644 --- a/machines/dragonwell/caddy.nix +++ b/machines/dragonwell/caddy.nix @@ -80,9 +80,7 @@ ''; "dnd.jolheiser.com".extraConfig = '' reverse_proxy localhost:30000 ''; - "ci.jolheiser.com".extraConfig = '' - reverse_proxy localhost:2423 -{ + enable = true; }; }; } diff --git a/machines/dragonwell/default.nix b/machines/dragonwell/default.nix index 052977ef7f2904dd718f9fdf13dba66c97f5c836..128b00de87787308cf3c6818423472f3e10e3177 100644 --- a/machines/dragonwell/default.nix +++ b/machines/dragonwell/default.nix @@ -13,8 +13,6 @@ ./git-pr.nix ./golink.nix ./gotosocial.nix let -{ -let imports = [ ./soju.nix ./tandoor.nix diff --git a/machines/dragonwell/jenkins.nix b/machines/dragonwell/jenkins.nix deleted file mode 100644 index 6e2f49aa7792fc09d56daa7d8f5a53c7a5c82cf5..0000000000000000000000000000000000000000 --- a/machines/dragonwell/jenkins.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ config, ... }: -{ - age.secrets.jenkins.file = ../../secrets/personal/jenkins.age; - services.jenkins = { - enable = true; - listenAddress = "localhost"; - port = 2423; - jobBuilder = { - enable = false; # Currently broken - 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 56c0a61b6fb02a6e6511ac2a5ff85c3fce781244..a2c3d3458ff2528fe3856a139b332da81212d54a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -50,9 +50,4 @@ jolheiser dragonwell ]; matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1"; -let - jolheiser - dragonwell - ]; - matcha = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILZxjkZLj/9xvmg1enK+B7k8qf6Px0j4kTZ2caQfYmB1"; jolheiser = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKrPUqk9v7FE7OgMDaOMdlnItiXSDkmS+eU94RzQFiMS";