diff --git a/nix/monitoring/prometheus.nix b/nix/monitoring/prometheus.nix index 8a9cec8..6f1bc8f 100644 --- a/nix/monitoring/prometheus.nix +++ b/nix/monitoring/prometheus.nix @@ -16,6 +16,12 @@ targets = [ "127.0.0.1:${toString config.services.prometheus.exporters.node.port}" ]; }]; } + { + job_name = "eve-psr-mc0"; + static_configs = [{ + targets = [ "192.168.0.131:7002" ]; + }]; + } ]; }; } diff --git a/nix/system/age.nix b/nix/system/age.nix index 052732f..6117ae1 100644 --- a/nix/system/age.nix +++ b/nix/system/age.nix @@ -2,6 +2,7 @@ age = { secrets = { cache-key.file = ../../secrets/cache-key.age; + cridycei.file = ../../secrets/cridycei.age; gitlab-runner.file = ../../secrets/gitlab-runner.age; graf-email = { file = ../../secrets/graf-email.age; diff --git a/nix/system/dns.nix b/nix/system/dns.nix index 5e48fe5..ce59d46 100644 --- a/nix/system/dns.nix +++ b/nix/system/dns.nix @@ -16,6 +16,13 @@ } } + mc.caitlynncox.com { + template IN A { + answer "{{ .Name }} 0 IN A 192.168.0.131" + } + } + + *.matri.cx { template IN A { answer "{{ .Name }} 0 IN A 192.168.0.130" @@ -40,24 +47,6 @@ } } - lobste.rs { - template IN A { - answer "{{ .Name }} 0 IN A 127.0.0.1" - } - } - - ycombinator.com { - template IN A { - answer "{{ .Name }} 0 IN A 127.0.0.1" - } - } - - *.ycombinator.com { - template IN A { - answer "{{ .Name }} 0 IN A 127.0.0.1" - } - } - . { forward . 9.9.9.9 149.112.112.112 84.200.69.80 84.200.70.40 cache diff --git a/nix/user/users.nix b/nix/user/users.nix index 93f4592..4142980 100644 --- a/nix/user/users.nix +++ b/nix/user/users.nix @@ -9,6 +9,14 @@ extraGroups = [ "wheel" "nginx" ]; packages = with pkgs; [ byobu tmux stack ]; }; - torrent = { isNormalUser = true; }; + + cridycei = { + isNormalUser = true; + passwordFile = config.age.secrets.cridycei.path; + extraGroups = [ ]; + packages = with pkgs; [ ]; + }; + + torrent.isNormalUser = true; }; } diff --git a/secrets.nix b/secrets.nix index d33c29f..b4d3fe3 100644 --- a/secrets.nix +++ b/secrets.nix @@ -7,6 +7,7 @@ let in { "secrets/cache-key.age" = { publicKeys = all; }; + "secrets/cridycei.age" = { publicKeys = all; }; "secrets/gitlab-runner.age" = { publicKeys = all; }; "secrets/graf-email.age" = { publicKeys = all; }; "secrets/htpasswd-dock.age" = { publicKeys = all; }; diff --git a/secrets/cridycei.age b/secrets/cridycei.age new file mode 100644 index 0000000..eeeada9 --- /dev/null +++ b/secrets/cridycei.age @@ -0,0 +1,9 @@ +age-encryption.org/v1 +-> ssh-ed25519 dQ70Fw JjlCw/irZPT376ImrCS5zNx5E7H/5S01p3Yht6mDgGg +W3/sDbylZ8M9tfgnAFvsmh0doQJwN57TNw2DFp4M8mo +-> ssh-ed25519 ZIoeGg Ci5IhC62qwp0+Q/3zwQxCFpq/2UNJAIx4W9FAUVtvxE +6DB1HgElb2I2TQ4rY2mLvvu3k0u2wBcp7/68eDrLy9Y +-> nqe>L"N-grease 2i

Ê"Z× \ No newline at end of file