From 6b5c3b62664d2d7a0fd2a7924f4ffb40d9d33771 Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Mon, 15 Jan 2024 10:22:07 +0100 Subject: [PATCH] voyager: update certs. Also update flake --- flake.lock | 53 +++++++++++++------------- flake.nix | 3 +- hosts/voyager/services/code-server.nix | 19 --------- hosts/voyager/services/snappymail.nix | 2 +- 4 files changed, 29 insertions(+), 48 deletions(-) delete mode 100644 hosts/voyager/services/code-server.nix diff --git a/flake.lock b/flake.lock index 3f3adfe..fbb0ebc 100644 --- a/flake.lock +++ b/flake.lock @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1703367386, - "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=", + "lastModified": 1704980875, + "narHash": "sha256-IPZmMjk5f4TBbEpzUFBc3OC1W6OwDNEXk2w/0uVXX1o=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224", + "rev": "5f0ab0eedc6ede69beb8f45561ffefa54edc6e65", "type": "github" }, "original": { @@ -80,11 +80,11 @@ ] }, "locked": { - "lastModified": 1703649338, - "narHash": "sha256-n2MkBotGgTQsfB+wH09R+otBwYCvGCsnHX7eUMGkKL0=", + "lastModified": 1704277720, + "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "8a8321271f0835fae2cb195e1137cb381fdbcc8e", + "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1703812100, - "narHash": "sha256-JN8qbWz6OPEEPwP+AmfAmlhPE19RqUqND6hGAeK2Od0=", + "lastModified": 1705108818, + "narHash": "sha256-V7zG8ihfhcopjaZbIvBl78icARrVPSrdeBpgyk3Aa5k=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "7d23e6f5635499a34d09950981cf42bb072f4fa2", + "rev": "9151fbf3086d10b5da436616175e71add449f0e1", "type": "github" }, "original": { @@ -147,11 +147,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1703351344, - "narHash": "sha256-9FEelzftkE9UaJ5nqxidaJJPEhe9TPhbypLHmc2Mysc=", + "lastModified": 1705033721, + "narHash": "sha256-K5eJHmL1/kev6WuqyqqbS1cdNnSidIZ3jeqJ7GbrYnQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268", + "rev": "a1982c92d8980a0114372973cbdfe0a307f1bdea", "type": "github" }, "original": { @@ -163,11 +163,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703467016, - "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", + "lastModified": 1705183652, + "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", + "rev": "428544ae95eec077c7f823b422afae5f174dee4b", "type": "github" }, "original": { @@ -197,11 +197,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1703387502, - "narHash": "sha256-JnWuQmyanPtF8c5yAEFXVWzaIlMxA3EAZCh8XNvnVqE=", + "lastModified": 1705201153, + "narHash": "sha256-y0/a4IMDZrc7lAkR7Gcm5R3W2iCBiARHnYZe6vkmiNE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e523e89763ff45f0a6cf15bcb1092636b1da9ed3", + "rev": "70dd0d521f7849338e487a219c1a07c429a66d77", "type": "github" }, "original": { @@ -227,11 +227,11 @@ }, "unstable": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", "type": "github" }, "original": { @@ -243,17 +243,16 @@ }, "voyager-addons": { "locked": { + "dirtyRev": "238bcd33b3e2562fcf76f86348909990ddc3d6cc-dirty", + "dirtyShortRev": "238bcd3-dirty", "lastModified": 1704460893, - "narHash": "sha256-rK+GBsfkua1Ou4YHcpQciDOdeS3q23GfTit2SddgTv0=", - "ref": "refs/heads/main", - "rev": "238bcd33b3e2562fcf76f86348909990ddc3d6cc", - "revCount": 3, + "narHash": "sha256-lh5nuxULb6Y8rPIDRWnvUOVs7j3jsp4QqiXvEpJjMec=", "type": "git", - "url": "ssh://git@git.feal.no:2222/felixalb/voyager-addons.git" + "url": "file:///home/felixalb/voyager-addons" }, "original": { "type": "git", - "url": "ssh://git@git.feal.no:2222/felixalb/voyager-addons.git" + "url": "file:///home/felixalb/voyager-addons" } } }, diff --git a/flake.nix b/flake.nix index cc3a277..e8f368b 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,8 @@ matrix-synapse-next.url = "github:dali99/nixos-matrix-modules"; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; - voyager-addons.url = "git+ssh://git@git.feal.no:2222/felixalb/voyager-addons.git"; + # voyager-addons.url = "git+ssh://git@git.feal.no:2222/felixalb/voyager-addons.git"; + voyager-addons.url = "git+file:///home/felixalb/voyager-addons"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/voyager/services/code-server.nix b/hosts/voyager/services/code-server.nix deleted file mode 100644 index b0dfef6..0000000 --- a/hosts/voyager/services/code-server.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, pkgs, lib, ... }: -let - cfg = config.services.code-server; -in { - services.code-server = { - enable = true; - host = "127.0.1.2"; - port = 4444; - }; - services.nginx.virtualHosts."code.home.feal.no" = { - forceSSL = true; - sslCertificateKey = "/etc/ssl-snakeoil/code_home_feal_no.key"; - sslCertificate = "/etc/ssl-snakeoil/code_home_feal_no.crt"; - locations."/" = { - proxyPass = "http://${cfg.host}:${toString cfg.port}"; - proxyWebsockets = true; - }; - }; -} diff --git a/hosts/voyager/services/snappymail.nix b/hosts/voyager/services/snappymail.nix index a6082aa..07e37a6 100644 --- a/hosts/voyager/services/snappymail.nix +++ b/hosts/voyager/services/snappymail.nix @@ -7,7 +7,7 @@ hostname = "mail.home.feal.no"; }; services.nginx.virtualHosts."${config.services.snappymail.hostname}" = let - certPath = "/etc/ssl-snakeoil/mail_home_feal_no"; + certPath = "/etc/ssl-snakeoil/home.feal.no"; in { addSSL = true;