commit 821f614eefbfe079439b993f1b32c7e1f6912ea8 · ryan.freumh.org/eilean-nix

+179 -2

flake.lock

···

       16
       16
        
               "type": "gitlab"

     

       17
       17
        
             }

     

       18
       18
        
           },

     

       19
       19
       +
           "eon": {

     

       20
       20
       +
             "inputs": {

     

       21
       21
       +
               "flake-utils": "flake-utils",

     

       22
       22
       +
               "nixpkgs": [

     

       23
       23
       +
                 "nixpkgs"

     

       24
       24
       +
               ],

     

       25
       25
       +
               "opam-nix": "opam-nix",

     

       26
       26
       +
               "opam-repository": "opam-repository"

     

       27
       27
       +
             },

     

       28
       28
       +
             "locked": {

     

       29
       29
       +
               "lastModified": 1713007178,

     

       30
       30
       +
               "narHash": "sha256-091K5GMtbNZE78gSviME6ARITr6AL94f3naLzt2DabM=",

     

       31
       31
       +
               "owner": "RyanGibb",

     

       32
       32
       +
               "repo": "eon",

     

       33
       33
       +
               "rev": "d2b108c439bbd6e8a315630d730037ef940d6c74",

     

       34
       34
       +
               "type": "github"

     

       35
       35
       +
             },

     

       36
       36
       +
             "original": {

     

       37
       37
       +
               "owner": "RyanGibb",

     

       38
       38
       +
               "repo": "eon",

     

       39
       39
       +
               "type": "github"

     

       40
       40
       +
             }

     

       41
       41
       +
           },

     

       19
       42
        
           "flake-compat": {

     

       20
       43
        
             "flake": false,

     

       21
       44
        
             "locked": {

     

       45
       45
       +
               "lastModified": 1627913399,

     

       46
       46
       +
               "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",

     

       47
       47
       +
               "owner": "edolstra",

     

       48
       48
       +
               "repo": "flake-compat",

     

       49
       49
       +
               "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",

     

       50
       50
       +
               "type": "github"

     

       51
       51
       +
             },

     

       52
       52
       +
             "original": {

     

       53
       53
       +
               "owner": "edolstra",

     

       54
       54
       +
               "repo": "flake-compat",

     

       55
       55
       +
               "type": "github"

     

       56
       56
       +
             }

     

       57
       57
       +
           },

     

       58
       58
       +
           "flake-compat_2": {

     

       59
       59
       +
             "flake": false,

     

       60
       60
       +
             "locked": {

     

       22
       61
        
               "lastModified": 1696426674,

     

       23
       62
        
               "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",

     

       24
       63
        
               "owner": "edolstra",

     
···

       32
       71
        
               "type": "github"

     

       33
       72
        
             }

     

       34
       73
        
           },

     

       74
       74
       +
           "flake-utils": {

     

       75
       75
       +
             "inputs": {

     

       76
       76
       +
               "systems": "systems"

     

       77
       77
       +
             },

     

       78
       78
       +
             "locked": {

     

       79
       79
       +
               "lastModified": 1710146030,

     

       80
       80
       +
               "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",

     

       81
       81
       +
               "owner": "numtide",

     

       82
       82
       +
               "repo": "flake-utils",

     

       83
       83
       +
               "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",

     

       84
       84
       +
               "type": "github"

     

       85
       85
       +
             },

     

       86
       86
       +
             "original": {

     

       87
       87
       +
               "owner": "numtide",

     

       88
       88
       +
               "repo": "flake-utils",

     

       89
       89
       +
               "type": "github"

     

       90
       90
       +
             }

     

       91
       91
       +
           },

     

       92
       92
       +
           "mirage-opam-overlays": {

     

       93
       93
       +
             "flake": false,

     

       94
       94
       +
             "locked": {

     

       95
       95
       +
               "lastModified": 1661959605,

     

       96
       96
       +
               "narHash": "sha256-CPTuhYML3F4J58flfp3ZbMNhkRkVFKmBEYBZY5tnQwA=",

     

       97
       97
       +
               "owner": "dune-universe",

     

       98
       98
       +
               "repo": "mirage-opam-overlays",

     

       99
       99
       +
               "rev": "05f1c1823d891ce4d8adab91f5db3ac51d86dc0b",

     

       100
       100
       +
               "type": "github"

     

       101
       101
       +
             },

     

       102
       102
       +
             "original": {

     

       103
       103
       +
               "owner": "dune-universe",

     

       104
       104
       +
               "repo": "mirage-opam-overlays",

     

       105
       105
       +
               "type": "github"

     

       106
       106
       +
             }

     

       107
       107
       +
           },

     

       35
       108
        
           "nixos-mailserver": {

     

       36
       109
        
             "inputs": {

     

       37
       110
        
               "blobs": "blobs",

     

       38
       38
       -
               "flake-compat": "flake-compat",

     

       111
       111
       +
               "flake-compat": "flake-compat_2",

     

       39
       112
        
               "nixpkgs": "nixpkgs",

     

       40
       113
        
               "nixpkgs-23_05": "nixpkgs-23_05",

     

       41
       114
        
               "nixpkgs-23_11": "nixpkgs-23_11",

     
···

       117
       190
        
               "type": "github"

     

       118
       191
        
             }

     

       119
       192
        
           },

     

       193
       193
       +
           "opam-nix": {

     

       194
       194
       +
             "inputs": {

     

       195
       195
       +
               "flake-compat": "flake-compat",

     

       196
       196
       +
               "flake-utils": [

     

       197
       197
       +
                 "eon",

     

       198
       198
       +
                 "flake-utils"

     

       199
       199
       +
               ],

     

       200
       200
       +
               "mirage-opam-overlays": "mirage-opam-overlays",

     

       201
       201
       +
               "nixpkgs": [

     

       202
       202
       +
                 "eon",

     

       203
       203
       +
                 "nixpkgs"

     

       204
       204
       +
               ],

     

       205
       205
       +
               "opam-overlays": "opam-overlays",

     

       206
       206
       +
               "opam-repository": [

     

       207
       207
       +
                 "eon",

     

       208
       208
       +
                 "opam-repository"

     

       209
       209
       +
               ],

     

       210
       210
       +
               "opam2json": "opam2json"

     

       211
       211
       +
             },

     

       212
       212
       +
             "locked": {

     

       213
       213
       +
               "lastModified": 1703105504,

     

       214
       214
       +
               "narHash": "sha256-z7X1i2T1H37Lj9hEIJA5T0+sdE5E+PSWiiSyvYGyGSY=",

     

       215
       215
       +
               "owner": "RyanGibb",

     

       216
       216
       +
               "repo": "opam-nix",

     

       217
       217
       +
               "rev": "ccf2e75e8854aefe933c4e504f436a3b315802ee",

     

       218
       218
       +
               "type": "github"

     

       219
       219
       +
             },

     

       220
       220
       +
             "original": {

     

       221
       221
       +
               "owner": "RyanGibb",

     

       222
       222
       +
               "ref": "pin-depends-path",

     

       223
       223
       +
               "repo": "opam-nix",

     

       224
       224
       +
               "type": "github"

     

       225
       225
       +
             }

     

       226
       226
       +
           },

     

       227
       227
       +
           "opam-overlays": {

     

       228
       228
       +
             "flake": false,

     

       229
       229
       +
             "locked": {

     

       230
       230
       +
               "lastModified": 1654162756,

     

       231
       231
       +
               "narHash": "sha256-RV68fUK+O3zTx61iiHIoS0LvIk0E4voMp+0SwRg6G6c=",

     

       232
       232
       +
               "owner": "dune-universe",

     

       233
       233
       +
               "repo": "opam-overlays",

     

       234
       234
       +
               "rev": "c8f6ef0fc5272f254df4a971a47de7848cc1c8a4",

     

       235
       235
       +
               "type": "github"

     

       236
       236
       +
             },

     

       237
       237
       +
             "original": {

     

       238
       238
       +
               "owner": "dune-universe",

     

       239
       239
       +
               "repo": "opam-overlays",

     

       240
       240
       +
               "type": "github"

     

       241
       241
       +
             }

     

       242
       242
       +
           },

     

       243
       243
       +
           "opam-repository": {

     

       244
       244
       +
             "flake": false,

     

       245
       245
       +
             "locked": {

     

       246
       246
       +
               "lastModified": 1712915335,

     

       247
       247
       +
               "narHash": "sha256-CLxKnc9GgeNom5LzGhDyq4ZP8Mx8NtwYsg2YQfcSk3U=",

     

       248
       248
       +
               "owner": "ocaml",

     

       249
       249
       +
               "repo": "opam-repository",

     

       250
       250
       +
               "rev": "03178cf5192dd1a55105844365e56a2294cd9225",

     

       251
       251
       +
               "type": "github"

     

       252
       252
       +
             },

     

       253
       253
       +
             "original": {

     

       254
       254
       +
               "owner": "ocaml",

     

       255
       255
       +
               "repo": "opam-repository",

     

       256
       256
       +
               "type": "github"

     

       257
       257
       +
             }

     

       258
       258
       +
           },

     

       259
       259
       +
           "opam2json": {

     

       260
       260
       +
             "inputs": {

     

       261
       261
       +
               "nixpkgs": [

     

       262
       262
       +
                 "eon",

     

       263
       263
       +
                 "opam-nix",

     

       264
       264
       +
                 "nixpkgs"

     

       265
       265
       +
               ]

     

       266
       266
       +
             },

     

       267
       267
       +
             "locked": {

     

       268
       268
       +
               "lastModified": 1671540003,

     

       269
       269
       +
               "narHash": "sha256-5pXfbUfpVABtKbii6aaI2EdAZTjHJ2QntEf0QD2O5AM=",

     

       270
       270
       +
               "owner": "tweag",

     

       271
       271
       +
               "repo": "opam2json",

     

       272
       272
       +
               "rev": "819d291ea95e271b0e6027679de6abb4d4f7f680",

     

       273
       273
       +
               "type": "github"

     

       274
       274
       +
             },

     

       275
       275
       +
             "original": {

     

       276
       276
       +
               "owner": "tweag",

     

       277
       277
       +
               "repo": "opam2json",

     

       278
       278
       +
               "type": "github"

     

       279
       279
       +
             }

     

       280
       280
       +
           },

     

       120
       281
        
           "root": {

     

       121
       282
        
             "inputs": {

     

       283
       283
       +
               "eon": "eon",

     

       122
       284
        
               "nixos-mailserver": "nixos-mailserver",

     

       123
       285
        
               "nixpkgs": "nixpkgs_2"

     

       124
       286
        
             }

     
···

       138
       300
        
               "type": "github"

     

       139
       301
        
             }

     

       140
       302
        
           },

     

       303
       303
       +
           "systems_2": {

     

       304
       304
       +
             "locked": {

     

       305
       305
       +
               "lastModified": 1681028828,

     

       306
       306
       +
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       307
       307
       +
               "owner": "nix-systems",

     

       308
       308
       +
               "repo": "default",

     

       309
       309
       +
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       310
       310
       +
               "type": "github"

     

       311
       311
       +
             },

     

       312
       312
       +
             "original": {

     

       313
       313
       +
               "owner": "nix-systems",

     

       314
       314
       +
               "repo": "default",

     

       315
       315
       +
               "type": "github"

     

       316
       316
       +
             }

     

       317
       317
       +
           },

     

       141
       318
        
           "utils": {

     

       142
       319
        
             "inputs": {

     

       143
       143
       -
               "systems": "systems"

     

       320
       320
       +
               "systems": "systems_2"

     

       144
       321
        
             },

     

       145
       322
        
             "locked": {

     

       146
       323
        
               "lastModified": 1709126324,

+4 -1

flake.nix

···

       2
       2
        
         inputs = {

     

       3
       3
        
           nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";

     

       4
       4
        
           nixos-mailserver.url = "github:RyanGibb/nixos-mailserver/fork-23.11";

     

       5
       5
       +
           eon.url = "github:RyanGibb/eon";

     

       6
       6
       +
           eon.inputs.nixpkgs.follows = "nixpkgs";

     

       5
       7
        
         };

     

       6
       8
        
       

     

       7
       7
       -
         outputs = { self, nixpkgs, nixos-mailserver, ... }: rec {

     

       9
       9
       +
         outputs = { self, nixpkgs, nixos-mailserver, eon, ... }: rec {

     

       8
       10
        
           packages = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed (system:

     

       9
       11
        
             let pkgs = nixpkgs.legacyPackages.${system};

     

       10
       12
        
             in { manpage = import ./man { inherit pkgs system nixos-mailserver; }; });

     
···

       13
       15
        
             imports = [

     

       14
       16
        
               ./modules/default.nix

     

       15
       17
        
               nixos-mailserver.nixosModule

     

       18
       18
       +
               eon.nixosModules.default

     

       16
       19
        
               ({ pkgs, config, ... }: {

     

       17
       20
        
                 nixpkgs.overlays = [

     

       18
       21
        
                   (final: prev: {

+2 -2

modules/services/dns/default.nix

···

       51
       51
        
           };

     

       52
       52
        
         };

     

       53
       53
        
       in {

     

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

     

       54
       54
       +
         imports = [ ./bind.nix ./eon.nix ];

     

       55
       55
        
       

     

       56
       56
        
         options.eilean.services.dns = {

     

       57
       57
        
           enable = mkEnableOption "DNS server";

     

       58
       58
        
           server = mkOption {

     

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

     

       59
       59
       +
             type = types.enum [ "bind" "eon" ];

     

       60
       60
        
             default = "bind";

     

       61
       61
        
           };

     

       62
       62
        
           openFirewall = mkOption {

+14

modules/services/dns/eon.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       let cfg = config.eilean.services.dns;

     

       4
       4
       +
       in lib.mkIf (cfg.enable && cfg.server == "eon") {

     

       5
       5
       +
         services.eon = {

     

       6
       6
       +
           enable = true;

     

       7
       7
       +
           zoneFiles = let

     

       8
       8
       +
             mapZonefile = zonename: zone:

     

       9
       9
       +
               "${

     

       10
       10
       +
                 import ./zonefile.nix { inherit pkgs config lib zonename zone; }

     

       11
       11
       +
               }/${zonename}";

     

       12
       12
       +
           in lib.attrsets.mapAttrsToList mapZonefile cfg.zones;

     

       13
       13
       +
         };

     

       14
       14
       +
       }