commit 9d7027b80ab57fece64090d7da9214e1d2b763df · ryan.freumh.org/eilean-nix

+48 -46

modules/dns.nix

···

       6
        
         

     

       7
        
         config.dns = lib.mkIf cfg.dns.enable {

     

       8
        
           enable = true;

     

       9
       -
           soa.serial = lib.mkDefault 0;

     

       10
       -
           records = builtins.concatMap (ns: [

     

       11
       -
             {

     

       12
       -
               name = "@";

     

       13
       -
               type = "NS";

     

       14
       -
               data = ns;

     

       15
       -
             }

     

       16
       -
             {

     

       17
       -
               name = ns;

     

       18
       -
               type = "A";

     

       19
       -
               data = cfg.serverIpv4;

     

       20
       -
             }

     

       21
       -
           ]) [ "ns1" "ns2" ] ++

     

       22
       -
           [

     

       23
       -
             {

     

       24
       -
               name = "www";

     

       25
       -
               type = "CNAME";

     

       26
       -
               data = "@";

     

       27
       -
             }

     

       0
        
       
     

       28
        
       

     

       29
       -
             {

     

       30
       -
               name = "@";

     

       31
       -
               type = "A";

     

       32
       -
               data = cfg.serverIpv4;

     

       33
       -
             }

     

       34
       -
             {

     

       35
       -
               name = "@";

     

       36
       -
               type = "AAAA";

     

       37
       -
               data = cfg.serverIpv6;

     

       38
       -
             }

     

       39
        
       

     

       40
       -
             {

     

       41
       -
               name = "vps";

     

       42
       -
               type = "A";

     

       43
       -
               data = cfg.serverIpv4;

     

       44
       -
             }

     

       45
       -
             {

     

       46
       -
               name = "vps";

     

       47
       -
               type = "AAAA";

     

       48
       -
               data = cfg.serverIpv6;

     

       49
       -
             }

     

       50
       -
             

     

       51
       -
             {

     

       52
       -
               name = "@";

     

       53
       -
               type = "LOC";

     

       54
       -
               data = "52 12 40.4 N 0 5 31.9 E 22m 10m 10m 10m";

     

       55
       -
             }

     

       56
       -
           ];

     

       0
        
       
     

       57
        
         };

     

       58
        
       }

···

       6
        
         

     

       7
        
         config.dns = lib.mkIf cfg.dns.enable {

     

       8
        
           enable = true;

     

       9
       +
           zones.${config.networking.domain} = {

     

       10
       +
             soa.serial = lib.mkDefault 0;

     

       11
       +
             records = builtins.concatMap (ns: [

     

       12
       +
               {

     

       13
       +
                 name = "@";

     

       14
       +
                 type = "NS";

     

       15
       +
                 data = ns;

     

       16
       +
               }

     

       17
       +
               {

     

       18
       +
                 name = ns;

     

       19
       +
                 type = "A";

     

       20
       +
                 data = cfg.serverIpv4;

     

       21
       +
               }

     

       22
       +
             ]) [ "ns1" "ns2" ] ++

     

       23
       +
             [

     

       24
       +
               {

     

       25
       +
                 name = "www";

     

       26
       +
                 type = "CNAME";

     

       27
       +
                 data = "@";

     

       28
       +
               }

     

       29
        
       

     

       30
       +
               {

     

       31
       +
                 name = "@";

     

       32
       +
                 type = "A";

     

       33
       +
                 data = cfg.serverIpv4;

     

       34
       +
               }

     

       35
       +
               {

     

       36
       +
                 name = "@";

     

       37
       +
                 type = "AAAA";

     

       38
       +
                 data = cfg.serverIpv6;

     

       39
       +
               }

     

       40
        
       

     

       41
       +
               {

     

       42
       +
                 name = "vps";

     

       43
       +
                 type = "A";

     

       44
       +
                 data = cfg.serverIpv4;

     

       45
       +
               }

     

       46
       +
               {

     

       47
       +
                 name = "vps";

     

       48
       +
                 type = "AAAA";

     

       49
       +
                 data = cfg.serverIpv6;

     

       50
       +
               }

     

       51
       +
               

     

       52
       +
               {

     

       53
       +
                 name = "@";

     

       54
       +
                 type = "LOC";

     

       55
       +
                 data = "52 12 40.4 N 0 5 31.9 E 22m 10m 10m 10m";

     

       56
       +
               }

     

       57
       +
             ];

     

       58
       +
           };

     

       59
        
         };

     

       60
        
       }

+11 -8

modules/dns/bind.nix

···

       5
        
           enable = true;

     

       6
        
           # recursive resolver

     

       7
        
           # cacheNetworks = [ "0.0.0.0/0" ];

     

       8
       -
           zones."${config.networking.domain}" = {

     

       9
       -
             master = true;

     

       10
       -
             file = import ./zonefile.nix { inherit pkgs config lib; };

     

       11
       -
             # axfr zone transfer

     

       12
       -
             slaves = [

     

       13
       -
               "127.0.0.1"

     

       14
       -
             ];

     

       15
       -
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
         };

     

       17
        
       }

···

       5
        
           enable = true;

     

       6
        
           # recursive resolver

     

       7
        
           # cacheNetworks = [ "0.0.0.0/0" ];

     

       8
       +
           zones =

     

       9
       +
             let mapZones = zonename: zone:

     

       10
       +
               {

     

       11
       +
                 master = true;

     

       12
       +
                 file = import ./zonefile.nix { inherit pkgs config lib zonename zone; };

     

       13
       +
                 # axfr zone transfer

     

       14
       +
                 slaves = [

     

       15
       +
                   "127.0.0.1"

     

       16
       +
                 ];

     

       17
       +
               };

     

       18
       +
             in builtins.mapAttrs mapZones cfg.zones;

     

       19
        
         };

     

       20
        
       }

+29 -28

modules/dns/default.nix

···

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     

       5
       -
       {

     

       6
       -
         imports = [ ./bind.nix ];

     

       7
       -
       

     

       8
       -
         options.dns = {

     

       9
       -
           enable = lib.mkEnableOption "DNS server";

     

       10
       -
           server = mkOption {

     

       11
       -
             type = types.enum [ "bind" ];

     

       12
       -
             default = "bind";

     

       13
       -
           };

     

       14
       -
           domain = mkOption {

     

       15
       -
             type = types.str;

     

       16
       -
             default = config.networking.domain;

     

       17
       -
           };

     

       18
        
           ttl = mkOption {

     

       19
        
             type = types.int;

     

       20
        
             default = 3600; # 1hr

     
···

       50
        
             };

     

       51
        
           };

     

       52
        
           records =

     

       53
       -
             let recordOpts = {

     

       54
       -
               options = {

     

       55
       -
                 name = mkOption {

     

       56
       -
                   type = types.str;

     

       57
       -
                 };

     

       58
       -
                 ttl = mkOption {

     

       59
       -
                   type = with types; nullOr int;

     

       60
       -
                   default = null;

     

       61
       -
                 };

     

       62
       -
                 type = mkOption {

     

       63
       -
                   type = types.str;

     

       64
       -
                 };

     

       65
       -
                 data = mkOption {

     

       66
       -
                   type = types.str;

     

       67
       -
                 };

     

       68
        
               };

     

       69
        
             };

     

       70
        
             in mkOption {

     

       71
        
               type = with types; listOf (submodule recordOpts);

     

       72
        
               default = [ ];

     

       73
        
             };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
         };

     

       75
        
       }

···

       2
        
       

     

       3
        
       with lib;

     

       4
        
       

     

       5
       +
       let

     

       6
       +
         zoneOptions.options = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       7
        
           ttl = mkOption {

     

       8
        
             type = types.int;

     

       9
        
             default = 3600; # 1hr

     
···

       39
        
             };

     

       40
        
           };

     

       41
        
           records =

     

       42
       +
             let recordOpts.options = {

     

       43
       +
               name = mkOption {

     

       44
       +
                 type = types.str;

     

       45
       +
               };

     

       46
       +
               ttl = mkOption {

     

       47
       +
                 type = with types; nullOr int;

     

       48
       +
                 default = null;

     

       49
       +
               };

     

       50
       +
               type = mkOption {

     

       51
       +
                 type = types.str;

     

       52
       +
               };

     

       53
       +
               data = mkOption {

     

       54
       +
                 type = types.str;

     

       0
        
       
     

       0
        
       
     

       55
        
               };

     

       56
        
             };

     

       57
        
             in mkOption {

     

       58
        
               type = with types; listOf (submodule recordOpts);

     

       59
        
               default = [ ];

     

       60
        
             };

     

       61
       +
         };

     

       62
       +
       in

     

       63
       +
       {

     

       64
       +
         imports = [ ./bind.nix ];

     

       65
       +
       

     

       66
       +
         options.dns = {

     

       67
       +
           enable = lib.mkEnableOption "DNS server";

     

       68
       +
           server = mkOption {

     

       69
       +
             type = types.enum [ "bind" ];

     

       70
       +
             default = "bind";

     

       71
       +
           };

     

       72
       +
           zones = mkOption {

     

       73
       +
             type = with types; attrsOf (submodule zoneOptions);

     

       74
       +
           };

     

       75
        
         };

     

       76
        
       }

+20 -12

modules/dns/zonefile.nix

···

       1
       -
       { pkgs, config, lib, ... }:

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       2
        
       

     

       3
       -
       let cfg = config.dns; in pkgs.writeTextFile {

     

       4
       -
         name = "zonefile";

     

       0
        
       
     

       5
        
         text = ''

     

       6
       -
           $ORIGIN ${cfg.domain}.

     

       7
       -
           $TTL ${builtins.toString cfg.ttl}

     

       8
       -
           @ IN SOA ${cfg.soa.ns} ${cfg.soa.email} (

     

       9
       -
             ${builtins.toString cfg.soa.serial}

     

       10
       -
             ${builtins.toString cfg.soa.refresh}

     

       11
       -
             ${builtins.toString cfg.soa.retry}

     

       12
       -
             ${builtins.toString cfg.soa.expire}

     

       13
       -
             ${builtins.toString cfg.soa.negativeCacheTtl}

     

       14
        
           )

     

       15
        
           ${

     

       16
        
             lib.strings.concatStringsSep "\n"

     

       17
       -
               (builtins.map (rr: "${rr.name} IN ${builtins.toString rr.ttl} ${rr.type} ${rr.data}") cfg.records)

     

       18
        
           }

     

       19
        
         '';

     

       20
        
       }

···

       1
       +
       {

     

       2
       +
         pkgs,

     

       3
       +
         config,

     

       4
       +
         lib,

     

       5
       +
         zonename,

     

       6
       +
         zone,

     

       7
       +
         ...

     

       8
       +
       }:

     

       9
        
       

     

       10
       +
       pkgs.writeTextFile {

     

       11
       +
         name = "zonefile-${zonename}";

     

       12
       +
         destination = "/${zonename}";

     

       13
        
         text = ''

     

       14
       +
           $ORIGIN ${zonename}.

     

       15
       +
           $TTL ${builtins.toString zone.ttl}

     

       16
       +
           @ IN SOA ${zone.soa.ns} ${zone.soa.email} (

     

       17
       +
             ${builtins.toString zone.soa.serial}

     

       18
       +
             ${builtins.toString zone.soa.refresh}

     

       19
       +
             ${builtins.toString zone.soa.retry}

     

       20
       +
             ${builtins.toString zone.soa.expire}

     

       21
       +
             ${builtins.toString zone.soa.negativeCacheTtl}

     

       22
        
           )

     

       23
        
           ${

     

       24
        
             lib.strings.concatStringsSep "\n"

     

       25
       +
               (builtins.map (rr: "${rr.name} IN ${builtins.toString rr.ttl} ${rr.type} ${rr.data}") zone.records)

     

       26
        
           }

     

       27
        
         '';

     

       28
        
       }

+1 -1

modules/gitea.nix

···

       83
        
             SystemCallFilter = lib.mkForce [];

     

       84
        
           };

     

       85
        
       

     

       86
       -
           dns.records = [

     

       87
        
             {

     

       88
        
               name = "git";

     

       89
        
               type = "CNAME";

···

       83
        
             SystemCallFilter = lib.mkForce [];

     

       84
        
           };

     

       85
        
       

     

       86
       +
           dns.zones.${config.networking.domain}.records = [

     

       87
        
             {

     

       88
        
               name = "git";

     

       89
        
               type = "CNAME";

+1 -1

modules/mailserver.nix

···

       43
        
             return 301 $scheme://${domain}$request_uri;

     

       44
        
           '';

     

       45
        
       

     

       46
       -
           dns.records = [

     

       47
        
             {

     

       48
        
               name = "mail";

     

       49
        
               type = "A";

···

       43
        
             return 301 $scheme://${domain}$request_uri;

     

       44
        
           '';

     

       45
        
       

     

       46
       +
           dns.zones.${config.networking.domain}.records = [

     

       47
        
             {

     

       48
        
               name = "mail";

     

       49
        
               type = "A";

+1 -1

modules/mastodon.nix

···

       68
        
             };

     

       69
        
           };

     

       70
        
       

     

       71
       -
           dns.records = [

     

       72
        
             {

     

       73
        
               name = "mastodon";

     

       74
        
               type = "CNAME";

···

       68
        
             };

     

       69
        
           };

     

       70
        
       

     

       71
       +
           dns.zones.${config.networking.domain}.records = [

     

       72
        
             {

     

       73
        
               name = "mastodon";

     

       74
        
               type = "CNAME";

+1 -1

modules/matrix.nix

···

       115
        
             ];

     

       116
        
           };

     

       117
        
       

     

       118
       -
           dns.records = [

     

       119
        
             {

     

       120
        
               name = "matrix";

     

       121
        
               type = "CNAME";

···

       115
        
             ];

     

       116
        
           };

     

       117
        
       

     

       118
       +
           dns.zones.${config.networking.domain}.records = [

     

       119
        
             {

     

       120
        
               name = "matrix";

     

       121
        
               type = "CNAME";

+1 -1

modules/turn.nix

···

       48
        
           };

     

       49
        
           users.groups."turnserver".members = [ config.services.nginx.user ];

     

       50
        
       

     

       51
       -
           dns.records = [

     

       52
        
             {

     

       53
        
               name = "turn";

     

       54
        
               type = "CNAME";

···

       48
        
           };

     

       49
        
           users.groups."turnserver".members = [ config.services.nginx.user ];

     

       50
        
       

     

       51
       +
           dns.zones.${config.networking.domain}.records = [

     

       52
        
             {

     

       53
        
               name = "turn";

     

       54
        
               type = "CNAME";