about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2020-04-04T12·17+0100
committerVincent Ambo <tazjin@google.com>2020-04-04T12·17+0100
commitf43294cd90812b1daa4134cdc4778ab6383aaada (patch)
tree73dfc1eda73886fa2574d665ba01697c75226d6a
parentde81e087d4b95d809a5f6eb48aa6a2fe4f26ace7 (diff)
chore(ops/nixos/camden): Use upstream tailscale module r/623
-rw-r--r--ops/nixos/camden/default.nix19
1 files changed, 1 insertions, 18 deletions
diff --git a/ops/nixos/camden/default.nix b/ops/nixos/camden/default.nix
index a978f8873aa4..cb8f1c2188c9 100644
--- a/ops/nixos/camden/default.nix
+++ b/ops/nixos/camden/default.nix
@@ -6,8 +6,6 @@ config: let
     config.allowUnfree = true;
   };
 in lib.fix(self: {
-  imports = [ ../modules/tailscale.nix ];
-
   # camden is intended to boot unattended, despite having an encrypted
   # root partition.
   #
@@ -88,7 +86,6 @@ in lib.fix(self: {
     # programs from the depot
     (with depot; [
       third_party.git
-      third_party.tailscale
       third_party.pounce
     ]) ++
 
@@ -126,21 +123,7 @@ in lib.fix(self: {
   services.haveged.enable = true;
 
   # Join Tailscale into home network
-  services.tailscale = {
-    enable = true;
-    relayConf = "/etc/tailscale.conf";
-    package = depot.third_party.tailscale;
-    aclFile = depot.nix.tailscale {
-      ACLs = [
-        # Allow any traffic from myself
-        {
-          Action = "accept";
-          Users = [ "mail@tazj.in" ];
-          Ports = [ "*:*" ];
-        }
-      ];
-    } ;
-  };
+  services.tailscale.enable = true;
 
   # Run cgit for the depot. The onion here is nginx(thttpd(cgit)).
   systemd.services.cgit = {