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

+4 -4

flake.lock

···

       2
       2
        
         "nodes": {

     

       3
       3
        
           "nixpkgs": {

     

       4
       4
        
             "locked": {

     

       5
       5
       -
               "lastModified": 1667231093,

     

       6
       6
       -
               "narHash": "sha256-RERXruzBEBuf0c7OfZeX1hxEKB+PTCUNxWeB6C1jd8Y=",

     

       7
       7
       -
               "owner": "nixos",

     

       5
       5
       +
               "lastModified": 1686921029,

     

       6
       6
       +
               "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=",

     

       7
       7
       +
               "owner": "NixOS",

     

       8
       8
        
               "repo": "nixpkgs",

     

       9
       9
       -
               "rev": "d40fea9aeb8840fea0d377baa4b38e39b9582458",

     

       9
       9
       +
               "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04",

     

       10
       10
        
               "type": "github"

     

       11
       11
        
             },

     

       12
       12
        
             "original": {

+6 -4

modules/gitea.nix

···

       19
       19
        
               enableACME = true;

     

       20
       20
        
               forceSSL = true;

     

       21
       21
        
               locations."/" = {

     

       22
       22
       -
                 proxyPass = "http://localhost:${builtins.toString config.services.gitea.httpPort}/";

     

       22
       22
       +
                 proxyPass = "http://localhost:${builtins.toString config.services.gitea.settings.server.HTTP_PORT}/";

     

       23
       23
        
               };

     

       24
       24
        
             };

     

       25
       25
        
           };

     
···

       36
       36
        
             enable = true;

     

       37
       37
        
             user = "git";

     

       38
       38
        
             appName = "git | ${domain}";

     

       39
       39
       -
             domain = "git.${domain}";

     

       40
       40
       -
             rootUrl = "https://git.${domain}/";

     

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

     

       42
       40
        
             settings = {

     

       41
       41
       +
               server = {

     

       42
       42
       +
                 ROOT_URL = "https://git.${domain}/";

     

       43
       43
       +
                 DOMAIN = "git.${domain}";

     

       44
       44
       +
               };

     

       43
       45
        
               mailer = {

     

       44
       46
        
                 ENABLED = true;

     

       45
       47
        
                 FROM = "git@${domain}";

     
···

       50
       52
        
               };

     

       51
       53
        
               repository.DEFAULT_BRANCH = "main";

     

       52
       54
        
               service.DISABLE_REGISTRATION = true;

     

       55
       55
       +
               #server.HTTP_PORT = 3000;

     

       53
       56
        
             };

     

       54
       57
        
             database = {

     

       55
       58
        
               type = "postgres";

     
···

       59
       62
        
               #createDatabase = true;

     

       60
       63
        
               #socket = "/run/postgresql";

     

       61
       64
        
             };

     

       62
       62
       -
             #httpPort = 3000;

     

       63
       65
        
             #stateDir = "/var/lib/gitea";

     

       64
       66
        
           };

     

       65
       67

+6 -6

modules/headscale.nix

···

       24
       24
        
             enable = true;

     

       25
       25
        
             # address = "127.0.0.1";

     

       26
       26
        
             port = 10000;

     

       27
       27
       -
             serverUrl = "https://${cfg.headscale.domain}";

     

       28
       28
       -
             dns = {

     

       29
       29
       -
               # magicDns = true;

     

       30
       30
       -
               nameservers = config.networking.nameservers;

     

       31
       31
       -
               baseDomain = "${cfg.headscale.zone}";

     

       32
       32
       -
             };

     

       33
       27
        
             settings = {

     

       28
       28
       +
               server_url = "https://${cfg.headscale.domain}";

     

       34
       29
        
               logtail.enabled = false;

     

       35
       30
        
               ip_prefixes = [ "100.64.0.0/10" ];

     

       31
       31
       +
               dns_config = {

     

       32
       32
       +
                 # magicDns = true;

     

       33
       33
       +
                 nameservers = config.networking.nameservers;

     

       34
       34
       +
                 base_domain = "${cfg.headscale.zone}";

     

       35
       35
       +
               };

     

       36
       36
        
             };

     

       37
       37
        
           };

     

       38
       38