commit be8f1b31735b86c98c2c12ba14bb16902202486e · ryan.freumh.org/eilean-nix

+1 -4

modules/default.nix

···

       21
       21
        
           username = mkOption {

     

       22
       22
        
             type = str;

     

       23
       23
        
           };

     

       24
       24
       -
           secretsDir = mkOption {

     

       25
       25
       -
             type = path;

     

       26
       26
       -
           };

     

       27
       24
        
           serverIpv4 = mkOption {

     

       28
       25
        
             type = str;

     

       29
       26
        
           };

     
···

       37
       34
        
       

     

       38
       35
        
         config = {

     

       39
       36
        
           security.acme.defaults.email = "${config.eilean.username}@${config.networking.domain}";

     

       40
       40
       -
           networking.firewall.allowedTCPPorts = lib.mkIf config.services.nginx.enable [

     

       37
       37
       +
           networking.firewall.allowedTCPPorts = mkIf config.services.nginx.enable [

     

       41
       38
        
             80 # HTTP

     

       42
       39
        
             443 # HTTPS

     

       43
       40
        
           ];

+6 -5

modules/dns.nix

···

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

     

       2
       2
        
       

     

       3
       3
       +
       with lib;

     

       3
       4
        
       let cfg = config.eilean; in

     

       4
       5
        
       {

     

       5
       6
        
         

     

       6
       7
        
         options.eilean.dns = {

     

       7
       7
       -
           enable = lib.mkEnableOption "dns";

     

       8
       8
       -
           nameservers = lib.mkOption {

     

       9
       9
       -
             type = lib.types.listOf lib.types.string;

     

       8
       8
       +
           enable = mkEnableOption "dns";

     

       9
       9
       +
           nameservers = mkOption {

     

       10
       10
       +
             type = types.listOf types.str;

     

       10
       11
        
             default = [ "ns1" "ns2" ];

     

       11
       12
        
           };

     

       12
       13
        
         };

     

       13
       14
        
         

     

       14
       14
       -
         config.eilean.services.dns = lib.mkIf cfg.dns.enable {

     

       15
       15
       +
         config.eilean.services.dns = mkIf cfg.dns.enable {

     

       15
       16
        
           enable = true;

     

       16
       17
        
           zones.${config.networking.domain} = {

     

       17
       17
       -
             soa.serial = lib.mkDefault 0;

     

       18
       18
       +
             soa.serial = mkDefault 0;

     

       18
       19
        
             records = builtins.concatMap (ns: [

     

       19
       20
        
               {

     

       20
       21
        
                 name = "@";

+27 -22

modules/gitea.nix

···

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

     

       2
       2
        
       

     

       3
       3
       +
       with lib;

     

       3
       4
        
       let

     

       4
       5
        
         cfg = config.eilean;

     

       5
       6
        
         domain = config.networking.domain;

     

       6
       7
        
       in {

     

       7
       8
        
         options.eilean.gitea = {

     

       8
       8
       -
           enable = lib.mkEnableOption "gitea";

     

       9
       9
       -
           sshPort = lib.mkOption {

     

       10
       10
       -
             type = lib.types.int;

     

       9
       9
       +
           enable = mkEnableOption "gitea";

     

       10
       10
       +
           sshPort = mkOption {

     

       11
       11
       +
             type = types.int;

     

       11
       12
        
             default = 3001;

     

       12
       13
        
           };

     

       14
       14
       +
           databasePasswordFile = mkOption {

     

       15
       15
       +
             type = types.nullOr types.path;

     

       16
       16
       +
             default = null;

     

       17
       17
       +
           };

     

       13
       18
        
         };

     

       14
       19
        
       

     

       15
       15
       -
         config = lib.mkIf cfg.gitea.enable {

     

       20
       20
       +
         config = mkIf cfg.gitea.enable {

     

       16
       21
        
           services.nginx = {

     

       17
       22
        
             enable = true;

     

       18
       23
        
             recommendedProxySettings = true;

     
···

       37
       42
        
             enable = true;

     

       38
       43
        
             user = "git";

     

       39
       44
        
             appName = "git | ${domain}";

     

       40
       40
       -
             mailerPasswordFile = "${config.eilean.secretsDir}/email-pswd-unhashed";

     

       45
       45
       +
             mailerPasswordFile = cfg.mailserver.systemAccountPasswordFile;

     

       41
       46
        
             settings = {

     

       42
       47
        
               server = {

     

       43
       48
        
                 ROOT_URL = "https://git.${domain}/";

     
···

       48
       53
        
                 FROM = "git@${domain}";

     

       49
       54
        
                 MAILER_TYPE = "smtp";

     

       50
       55
        
                 HOST = "mail.${domain}:465";

     

       51
       51
       -
                 USER = "misc@${domain}";

     

       56
       56
       +
                 USER = "system@${domain}";

     

       52
       57
        
                 IS_TLS_ENABLED = true;

     

       53
       58
        
               };

     

       54
       59
        
               repository.DEFAULT_BRANCH = "main";

     
···

       57
       62
        
             };

     

       58
       63
        
             database = {

     

       59
       64
        
               type = "postgres";

     

       60
       60
       -
               passwordFile = "${config.eilean.secretsDir}/gitea-db";

     

       65
       65
       +
               passwordFile = cfg.gitea.databasePasswordFile;

     

       61
       66
        
               user = "git";

     

       62
       67
        
               name = "git";

     

       63
       68
        
               #createDatabase = true;

     
···

       69
       74
        
           # https://github.com/NixOS/nixpkgs/issues/103446

     

       70
       75
        
           systemd.services.gitea.serviceConfig = {

     

       71
       76
        
             ReadWritePaths = [ "/var/lib/postfix/queue/maildrop" ];

     

       72
       72
       -
             NoNewPrivileges = lib.mkForce false;

     

       73
       73
       -
             PrivateDevices = lib.mkForce false;

     

       74
       74
       -
             PrivateUsers = lib.mkForce false;

     

       75
       75
       -
             ProtectHostname = lib.mkForce false;

     

       76
       76
       -
             ProtectClock = lib.mkForce false;

     

       77
       77
       -
             ProtectKernelTunables = lib.mkForce false;

     

       78
       78
       -
             ProtectKernelModules = lib.mkForce false;

     

       79
       79
       -
             ProtectKernelLogs = lib.mkForce false;

     

       80
       80
       -
             RestrictAddressFamilies = lib.mkForce [ ];

     

       81
       81
       -
             LockPersonality = lib.mkForce false;

     

       82
       82
       -
             MemoryDenyWriteExecute = lib.mkForce false;

     

       83
       83
       -
             RestrictRealtime = lib.mkForce false;

     

       84
       84
       -
             RestrictSUIDSGID = lib.mkForce false;

     

       85
       85
       -
             SystemCallArchitectures = lib.mkForce "";

     

       86
       86
       -
             SystemCallFilter = lib.mkForce [];

     

       77
       77
       +
             NoNewPrivileges = mkForce false;

     

       78
       78
       +
             PrivateDevices = mkForce false;

     

       79
       79
       +
             PrivateUsers = mkForce false;

     

       80
       80
       +
             ProtectHostname = mkForce false;

     

       81
       81
       +
             ProtectClock = mkForce false;

     

       82
       82
       +
             ProtectKernelTunables = mkForce false;

     

       83
       83
       +
             ProtectKernelModules = mkForce false;

     

       84
       84
       +
             ProtectKernelLogs = mkForce false;

     

       85
       85
       +
             RestrictAddressFamilies = mkForce [ ];

     

       86
       86
       +
             LockPersonality = mkForce false;

     

       87
       87
       +
             MemoryDenyWriteExecute = mkForce false;

     

       88
       88
       +
             RestrictRealtime = mkForce false;

     

       89
       89
       +
             RestrictSUIDSGID = mkForce false;

     

       90
       90
       +
             SystemCallArchitectures = mkForce "";

     

       91
       91
       +
             SystemCallFilter = mkForce [];

     

       87
       92
        
           };

     

       88
       93
        
       

     

       89
       94
        
           eilean.dns.enable = true;

+2 -1

modules/headscale.nix

···

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

     

       2
       2
        
       

     

       3
       3
       +
       with lib;

     

       3
       4
        
       let

     

       4
       5
        
         cfg = config.eilean;

     

       5
       6
        
       in {

     
···

       15
       16
        
           };

     

       16
       17
        
         };

     

       17
       18
        
       

     

       18
       18
       -
         config = lib.mkIf cfg.headscale.enable {

     

       19
       19
       +
         config = mkIf cfg.headscale.enable {

     

       19
       20
        
           # To set up:

     

       20
       21
        
           #   `headscale namespaces create <namespace_name>`

     

       21
       22
        
           # To add a node:

+17 -20

modules/mailserver.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
       +
       with lib;

     

       3
       4
        
       let

     

       4
       5
        
         cfg = config.eilean;

     

       5
       6
        
         domain = config.networking.domain;

     

       6
       7
        
       in {

     

       7
       7
       -
         options.eilean.mailserver.enable = lib.mkEnableOption "mailserver";

     

       8
       8
       +
         options.eilean.mailserver = {

     

       9
       9
       +
           enable = mkEnableOption "mailserver";

     

       10
       10
       +
           systemAccountPasswordFile = mkOption {

     

       11
       11
       +
             type = types.nullOr types.str;

     

       12
       12
       +
             default = null;

     

       13
       13
       +
           };

     

       14
       14
       +
         };

     

       8
       15
        
       

     

       9
       9
       -
         config = lib.mkIf cfg.mailserver.enable {

     

       16
       16
       +
         config = mkIf cfg.mailserver.enable {

     

       10
       17
        
           mailserver = {

     

       11
       18
        
             enable = true;

     

       12
       19
        
             fqdn = "mail.${domain}";

     

       13
       20
        
             domains = [ "${domain}" ];

     

       14
       21
        
       

     

       15
       15
       -
             # A list of all login accounts. To create the password hashes, use

     

       16
       16
       -
             # nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2

     

       17
       22
        
             loginAccounts = {

     

       18
       18
       -
                 "${cfg.username}@${domain}" = {

     

       19
       19
       -
                     hashedPasswordFile = "${config.eilean.secretsDir}/email-pswd";

     

       20
       20
       -
                     aliases = [

     

       21
       21
       -
                       "dns@${domain}"

     

       22
       22
       -
                       "postmaster@${domain}"

     

       23
       23
       -
                     ];

     

       24
       24
       -
                 };

     

       25
       25
       -
                 "misc@${domain}" = {

     

       26
       26
       -
                     hashedPasswordFile = "${config.eilean.secretsDir}/email-pswd";

     

       27
       27
       -
                     aliases = [

     

       28
       28
       -
                       "git@${domain}"

     

       29
       29
       -
                       "mastodon@${domain}"

     

       30
       30
       -
                     ];

     

       31
       31
       -
                     catchAll = [ "${domain}" ];

     

       32
       32
       -
                 };

     

       23
       23
       +
               "system@${domain}" = {

     

       24
       24
       +
                 passwordFile = cfg.mailserver.systemAccountPasswordFile;

     

       25
       25
       +
                 aliases = [

     

       26
       26
       +
                   (mkIf cfg.gitea.enable "git@${domain}")

     

       27
       27
       +
                   (mkIf cfg.mastodon.enable "mastodon@${domain}")

     

       28
       28
       +
                 ];

     

       29
       29
       +
               };

     

       33
       30
        
             };

     

       34
       31
        
       

     

       35
       32
        
             # Use Let's Encrypt certificates. Note that this needs to set up a stripped

+4 -4

modules/mailserver/common.nix

···

       39
       39
        
                          else throw "Error: Certificate Scheme must be in { 1, 2, 3 }";

     

       40
       40
        
       

     

       41
       41
        
         passwordFiles = let

     

       42
       42
       -
           mkHashFile = name: hash: pkgs.writeText "${builtins.hashString "sha256" name}-password-hash" hash;

     

       42
       42
       +
           mkHashFile = name: hash: pkgs.writeText "${builtins.hashString "sha256" name}-password" hash;

     

       43
       43
        
         in

     

       44
       44
        
           lib.mapAttrs (name: value:

     

       45
       45
       -
           if value.hashedPasswordFile == null then

     

       46
       46
       -
             builtins.toString (mkHashFile name value.hashedPassword)

     

       47
       47
       -
           else value.hashedPasswordFile) cfg.loginAccounts;

     

       45
       45
       +
           if value.passwordFile == null then

     

       46
       46
       +
             builtins.toString (mkHashFile name value.password)

     

       47
       47
       +
           else value.passwordFile) cfg.loginAccounts;

     

       48
       48
        
       }

+7 -15

modules/mailserver/default.nix

···

       67
       67
        
                   description = "Username";

     

       68
       68
        
                 };

     

       69
       69
        
       

     

       70
       70
       -
                 hashedPassword = mkOption {

     

       70
       70
       +
                 password = mkOption {

     

       71
       71
        
                   type = with types; nullOr str;

     

       72
       72
        
                   default = null;

     

       73
       73
        
                   example = "$6$evQJs5CFQyPAW09S$Cn99Y8.QjZ2IBnSu4qf1vBxDRWkaIZWOtmu1Ddsm3.H3CFpeVc0JU4llIq8HQXgeatvYhh5O33eWG3TSpjzu6/";

     

       74
       74
        
                   description = ''

     

       75
       75
       -
                     The user's hashed password. Use `htpasswd` as follows

     

       76
       76
       -
       

     

       77
       77
       -
                     ```

     

       78
       78
       -
                     nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2

     

       79
       79
       -
                     ```

     

       75
       75
       +
                     The password.

     

       80
       76
        
       

     

       81
       77
        
                     Warning: this is stored in plaintext in the Nix store!

     

       82
       82
       -
                     Use `hashedPasswordFile` instead.

     

       78
       78
       +
                     Use `passwordFile` instead.

     

       83
       79
        
                   '';

     

       84
       80
        
                 };

     

       85
       81
        
       

     

       86
       86
       -
                 hashedPasswordFile = mkOption {

     

       82
       82
       +
                 passwordFile = mkOption {

     

       87
       83
        
                   type = with types; nullOr path;

     

       88
       84
        
                   default = null;

     

       89
       85
        
                   example = "/run/keys/user1-passwordhash";

     

       90
       86
        
                   description = ''

     

       91
       91
       -
                     A file containing the user's hashed password. Use `htpasswd` as follows

     

       92
       92
       -
       

     

       93
       93
       -
                     ```

     

       94
       94
       -
                     nix run nixpkgs.apacheHttpd -c htpasswd -nbB "" "super secret password" | cut -d: -f2

     

       95
       95
       -
                     ```

     

       87
       87
       +
                     A file containing the user's password.

     

       96
       88
        
                   '';

     

       97
       89
        
                 };

     

       98
       90
        
       

     
···

       176
       168
        
             }));

     

       177
       169
        
             example = {

     

       178
       170
        
               user1 = {

     

       179
       179
       -
                 hashedPassword = "$6$evQJs5CFQyPAW09S$Cn99Y8.QjZ2IBnSu4qf1vBxDRWkaIZWOtmu1Ddsm3.H3CFpeVc0JU4llIq8HQXgeatvYhh5O33eWG3TSpjzu6/";

     

       171
       171
       +
                 password = "$6$evQJs5CFQyPAW09S$Cn99Y8.QjZ2IBnSu4qf1vBxDRWkaIZWOtmu1Ddsm3.H3CFpeVc0JU4llIq8HQXgeatvYhh5O33eWG3TSpjzu6/";

     

       180
       172
        
               };

     

       181
       173
        
               user2 = {

     

       182
       182
       -
                 hashedPassword = "$6$oE0ZNv2n7Vk9gOf$9xcZWCCLGdMflIfuA0vR1Q1Xblw6RZqPrP94mEit2/81/7AKj2bqUai5yPyWE.QYPyv6wLMHZvjw3Rlg7yTCD/";

     

       174
       174
       +
                 password = "$6$oE0ZNv2n7Vk9gOf$9xcZWCCLGdMflIfuA0vR1Q1Xblw6RZqPrP94mEit2/81/7AKj2bqUai5yPyWE.QYPyv6wLMHZvjw3Rlg7yTCD/";

     

       183
       175
        
               };

     

       184
       176
        
             };

     

       185
       177
        
             description = ''

+2 -1

modules/mailserver/dovecot.nix

···

       76
       76
        
       

     

       77
       77
        
           cat <<EOF > ${passwdFile}

     

       78
       78
        
           ${lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value:

     

       79
       79
       -
             "${name}:${"$(head -n 1 ${passwordFiles."${name}"})"}:${builtins.toString cfg.vmailUID}:${builtins.toString cfg.vmailUID}::${cfg.mailDirectory}:/run/current-system/sw/bin/nologin:"

     

       79
       79
       +
             let passwordHash = ''$(head -n 1 ${passwordFiles."${name}"} | ${pkgs.findutils}/bin/xargs --null ${pkgs.apacheHttpd}/bin/htpasswd -nbB "" | cut -d: -f2)''; in

     

       80
       80
       +
             "${name}:${passwordHash}:${builtins.toString cfg.vmailUID}:${builtins.toString cfg.vmailUID}::${cfg.mailDirectory}:/run/current-system/sw/bin/nologin:"

     

       80
       81
        
               + (if lib.isString value.quota

     

       81
       82
        
                     then "userdb_quota_rule=*:storage=${value.quota}"

     

       82
       83
        
                     else "")

+4 -4

modules/mailserver/users.nix

···

       68
       68
        
         config = lib.mkIf enable {

     

       69
       69
        
           # assert that all accounts provide a password

     

       70
       70
        
           assertions = (map (acct: {

     

       71
       71
       -
             assertion = (acct.hashedPassword != null || acct.hashedPasswordFile != null);

     

       72
       72
       -
             message = "${acct.name} must provide either a hashed password or a password hash file";

     

       71
       71
       +
             assertion = (acct.password != null || acct.passwordFile != null);

     

       72
       72
       +
             message = "${acct.name} must provide either a password or a password file";

     

       73
       73
        
           }) (lib.attrValues loginAccounts));

     

       74
       74
        
       

     

       75
       75
        
           # warn for accounts that specify both password and file

     

       76
       76
        
           warnings = (map

     

       77
       77
       -
             (acct: "${acct.name} specifies both a password hash and hash file; hash file will be used")

     

       77
       77
       +
             (acct: "${acct.name} specifies both a password and password file; password file will be used")

     

       78
       78
        
             (lib.filter

     

       79
       79
       -
               (acct: (acct.hashedPassword != null && acct.hashedPasswordFile != null))

     

       79
       79
       +
               (acct: (acct.password != null && acct.passwordFile != null))

     

       80
       80
        
               (lib.attrValues loginAccounts)));

     

       81
       81
        
       

     

       82
       82
        
           # set the vmail gid to a specific value

+7 -4

modules/mastodon.nix

···

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

     

       2
       2
        
       

     

       3
       3
       +
       with lib;

     

       3
       4
        
       let

     

       4
       5
        
         cfg = config.eilean;

     

       5
       6
        
         domain = config.networking.domain;

     

       6
       7
        
       in {

     

       7
       7
       -
         options.eilean.mastodon.enable = lib.mkEnableOption "mastodon";

     

       8
       8
       +
         options.eilean.mastodon = {

     

       9
       9
       +
           enable = mkEnableOption "mastodon";

     

       10
       10
       +
         };

     

       8
       11
        
       

     

       9
       9
       -
         config = lib.mkIf cfg.mastodon.enable {

     

       12
       12
       +
         config = mkIf cfg.mastodon.enable {

     

       10
       13
        
           services.mastodon = {

     

       11
       14
        
             enable = true;

     

       12
       15
        
             enableUnixSocket = false;

     
···

       16
       19
        
             streamingProcesses = 3;

     

       17
       20
        
             smtp = {

     

       18
       21
        
               #createLocally = false;

     

       19
       19
       -
               user = "misc@${domain}";

     

       22
       22
       +
               user = "system@${domain}";

     

       20
       23
        
               port = 465;

     

       21
       24
        
               host = "mail.${domain}";

     

       22
       25
        
               authenticate = true;

     

       23
       23
       -
               passwordFile = "${config.eilean.secretsDir}/email-pswd-unhashed";

     

       26
       26
       +
               passwordFile = cfg.mailserver.systemAccountPasswordFile;

     

       24
       27
        
               fromAddress = "mastodon@${domain}";

     

       25
       28
        
             };

     

       26
       29
        
             extraConfig = {

+38 -10

modules/matrix.nix

···

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

     

       2
       2
        
       

     

       3
       3
       -
       let cfg = config.eilean; in

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       let

     

       5
       5
       +
         cfg = config.eilean;

     

       6
       6
       +
         turnSharedSecretFile = "/run/matrix-synapse/turn-shared-secret";

     

       7
       7
       +
       in

     

       4
       8
        
       {

     

       5
       9
        
         options.eilean.matrix = {

     

       6
       6
       -
           enable = lib.mkEnableOption "matrix";

     

       7
       7
       -
           turn = lib.mkOption {

     

       8
       8
       -
             type = lib.types.bool;

     

       10
       10
       +
           enable = mkEnableOption "matrix";

     

       11
       11
       +
           turn = mkOption {

     

       12
       12
       +
             type = types.bool;

     

       9
       13
        
             default = true;

     

       10
       14
        
           };

     

       15
       15
       +
           registrationSecretFile = mkOption {

     

       16
       16
       +
             type = types.nullOr types.str;

     

       17
       17
       +
             default = null;

     

       18
       18
       +
           };

     

       11
       19
        
         };

     

       12
       20
        
       

     

       13
       13
       -
         config = lib.mkIf cfg.matrix.enable {

     

       21
       21
       +
         config = mkIf cfg.matrix.enable {

     

       14
       22
        
           services.postgresql.enable = true;

     

       15
       23
        
           services.postgresql.package = pkgs.postgresql_13;

     

       16
       24
        
           services.postgresql.initialScript = pkgs.writeText "synapse-init.sql" ''

     
···

       89
       97
        
       

     

       90
       98
        
           services.matrix-synapse = {

     

       91
       99
        
             enable = true;

     

       92
       92
       -
             settings = lib.mkMerge [

     

       100
       100
       +
             settings = mkMerge [

     

       93
       101
        
               {

     

       94
       102
        
                 server_name = config.networking.domain;

     

       95
       103
        
                 enable_registration = true;

     

       96
       104
        
                 registration_requires_token = true;

     

       97
       97
       -
                 registration_shared_secret_path = "${config.eilean.secretsDir}/matrix-shared-secret";

     

       105
       105
       +
                 registration_shared_secret_path = cfg.matrix.registrationSecretFile;

     

       98
       106
        
                 listeners = [

     

       99
       107
        
                   {

     

       100
       108
        
                     port = 8008;

     
···

       112
       120
        
                 ];

     

       113
       121
        
                 max_upload_size = "100M";

     

       114
       122
        
               }

     

       115
       115
       -
               (lib.mkIf cfg.matrix.turn {

     

       123
       123
       +
               (mkIf cfg.matrix.turn {

     

       116
       124
        
                 turn_uris = with config.services.coturn; [

     

       117
       125
        
                   "turn:${realm}:3478?transport=udp"

     

       118
       126
        
                   "turn:${realm}:3478?transport=tcp"

     
···

       122
       130
        
                 turn_user_lifetime = "1h";

     

       123
       131
        
               })

     

       124
       132
        
             ];

     

       125
       125
       -
             extraConfigFiles = [ "${config.eilean.secretsDir}/matrix-turn-shared-secret" ];

     

       133
       133
       +
             extraConfigFiles = mkIf cfg.matrix.turn (

     

       134
       134
       +
               [ turnSharedSecretFile ]

     

       135
       135
       +
             );

     

       126
       136
        
           };

     

       127
       137
        
       

     

       128
       128
       -
           eilean.turn.enable = lib.mkIf cfg.matrix.turn true;

     

       138
       138
       +
           systemd.services = mkIf cfg.matrix.turn {

     

       139
       139
       +
             matrix-synapse-turn-shared-secret-generator = {

     

       140
       140
       +
               description = "Generate matrix synapse turn shared secret config file";

     

       141
       141
       +
               script = ''

     

       142
       142
       +
                 mkdir -p "$(dirname '${turnSharedSecretFile}')"

     

       143
       143
       +
                 echo "turn_shared_secret: $(cat '${cfg.turn.secretFile}')" > '${turnSharedSecretFile}'

     

       144
       144
       +
                 chmod 770 '${turnSharedSecretFile}'

     

       145
       145
       +
                 chown ${config.systemd.services.matrix-synapse.serviceConfig.User}:${config.systemd.services.matrix-synapse.serviceConfig.Group} '${turnSharedSecretFile}'

     

       146
       146
       +
               '';

     

       147
       147
       +
               serviceConfig.Type = "oneshot";

     

       148
       148
       +
               serviceConfig.RemainAfterExit = true;

     

       149
       149
       +
             };

     

       150
       150
       +
             "matrix-synapse" = {

     

       151
       151
       +
               after = [ "matrix-synapse-turn-shared-secret-generator.service" ];

     

       152
       152
       +
               requires = [ "matrix-synapse-turn-shared-secret-generator.service" ];

     

       153
       153
       +
             };

     

       154
       154
       +
           };

     

       155
       155
       +
       

     

       156
       156
       +
           eilean.turn.enable = mkIf cfg.matrix.turn true;

     

       129
       157
        
       

     

       130
       158
        
           eilean.dns.enable = true;

     

       131
       159
        
           eilean.services.dns.zones.${config.networking.domain}.records = [

+2 -3

modules/services/dns/default.nix

···

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
       -
       

     

       5
       4
        
       let

     

       6
       5
        
         zoneOptions.options = {

     

       7
       6
        
           ttl = mkOption {

     
···

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

     

       65
       64
        
       

     

       66
       65
        
         options.eilean.services.dns = {

     

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

     

       66
       66
       +
           enable = mkEnableOption "DNS server";

     

       68
       67
        
           server = mkOption {

     

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

     

       70
       69
        
             default = "bind";

     
···

       78
       77
        
           };

     

       79
       78
        
         };

     

       80
       79
        
       

     

       81
       81
       -
         config.networking.firewall = lib.mkIf config.eilean.services.dns.openFirewall {

     

       80
       80
       +
         config.networking.firewall = mkIf config.eilean.services.dns.openFirewall {

     

       82
       81
        
           allowedTCPPorts = [ 53 ];

     

       83
       82
        
           allowedUDPPorts = [ 53 ];

     

       84
       83
        
         };

+10 -3

modules/turn.nix

···

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

     

       2
       2
        
       

     

       3
       3
       +
       with lib;

     

       3
       4
        
       let

     

       4
       5
        
         cfg = config.eilean;

     

       5
       6
        
         domain = config.networking.domain;

     

       6
       7
        
       in

     

       7
       8
        
       {

     

       8
       8
       -
         options.eilean.turn.enable = lib.mkEnableOption "TURN server";

     

       9
       9
       +
         options.eilean.turn = {

     

       10
       10
       +
           enable = mkEnableOption "TURN server";

     

       11
       11
       +
           secretFile = mkOption {

     

       12
       12
       +
             type = types.nullOr types.str;

     

       13
       13
       +
             default = null;

     

       14
       14
       +
           };

     

       15
       15
       +
         };

     

       9
       16
        
       

     

       10
       10
       -
         config = lib.mkIf cfg.turn.enable {

     

       17
       17
       +
         config = mkIf cfg.turn.enable {

     

       11
       18
        
           services.coturn = rec {

     

       12
       19
        
             enable = true;

     

       13
       20
        
             no-cli = true;

     

       14
       21
        
             no-tcp-relay = true;

     

       15
       22
        
             secure-stun = true;

     

       16
       23
        
             use-auth-secret = true;

     

       17
       17
       -
             static-auth-secret-file = "${config.eilean.secretsDir}/coturn";

     

       24
       24
       +
             static-auth-secret-file = "${cfg.turn.secretFile}";

     

       18
       25
        
             realm = "turn.${domain}";

     

       19
       26
        
             relay-ips = with config.eilean; [

     

       20
       27
        
               serverIpv4

+5 -2

modules/wireguard/default.nix

···

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
       -
       

     

       5
       4
        
       let cfg = config.wireguard; in

     

       6
       5
        
       {

     

       7
       6
        
         options.wireguard = {

     
···

       35
       34
        
                   type = with types; nullOr int;

     

       36
       35
        
                   default = null;

     

       37
       36
        
                 };

     

       37
       37
       +
                 privateKeyFile = mkOption {

     

       38
       38
       +
                   type = types.nullOr types.str;

     

       39
       39
       +
                   default = null;

     

       40
       40
       +
                 };

     

       38
       41
        
               };

     

       39
       42
        
             };

     

       40
       43
        
             in mkOption {

     
···

       65
       68
        
                     [ "${cfg.hosts."${hostName}".ip}/24" ]

     

       66
       69
        
                   else [ ];

     

       67
       70
        
                 listenPort = 51820; 

     

       68
       68
       -
                 privateKeyFile = "${config.eilean.secretsDir}/wireguard-key-${hostName}";

     

       71
       71
       +
                 privateKeyFile = cfg.hosts."${hostName}".privateKeyFile;

     

       69
       72
        
                 peers =

     

       70
       73
        
                   let

     

       71
       74
        
                     serverPeers = attrsets.mapAttrsToList

-2

template/configuration.nix

···

       67
       67
        
           # mastodon.enable = true;

     

       68
       68
        
           # gitea.enable = true;

     

       69
       69
        
           # headscale.enable = true;

     

       70
       70
       -
       

     

       71
       71
       -
           # secretsDir = "/secrets";

     

       72
       70
        
         };

     

       73
       71
        
       

     

       74
       72
        
         # This value determines the NixOS release from which the default