commit 77c7f3535d1b360e7b8208bc91461fb52c569bf8 · aylac.top/nixcfg-own-knot

+6 -9

modules/nixos/services/glance/default.nix

···

       9
       9
        
         inherit (config.mySnippets) aylac-top;

     

       10
       10
        
         inherit (config.mySnippets) tailnet;

     

       11
       11
        
       

     

       12
       12
       -
         publicNetwork = aylac-top;

     

       13
       13
       -
         privateNetwork = tailnet;

     

       12
       12
       +
         network = config.mySnippets.tailnet;

     

       13
       13
       +
       

     

       14
       14
       +
         service = network.networkMap.${name};

     

       14
       15
        
       in {

     

       15
       16
        
         options.myNixOS.services.${name} = {

     

       16
       17
        
           enable = lib.mkEnableOption "${name} server";

     
···

       24
       25
        
       

     

       25
       26
        
         config = lib.mkIf cfg.enable {

     

       26
       27
        
           services = {

     

       27
       27
       -
             caddy.virtualHosts."${privateNetwork.networkMap.${name}.vHost}".extraConfig = lib.mkIf cfg.autoProxy ''

     

       28
       28
       +
             caddy.virtualHosts."${service.vHost}".extraConfig = lib.mkIf cfg.autoProxy ''

     

       28
       29
        
               bind tailscale/${name}

     

       29
       30
        
               encode zstd gzip

     

       30
       30
       -
               reverse_proxy ${privateNetwork.networkMap.${name}.hostName}:${toString privateNetwork.networkMap.${name}.port}

     

       31
       31
       +
               reverse_proxy ${service.hostName}:${toString service.port}

     

       31
       32
        
             '';

     

       32
       32
       -
       

     

       33
       33
       -
             cloudflared.tunnels."${publicNetwork.cloudflareTunnel}".ingress = lib.mkIf cfg.autoProxy {

     

       34
       34
       -
               "${publicNetwork.networkMap.pds.vHost}" = "http://${publicNetwork.networkMap.pds.hostName}";

     

       35
       35
       -
             };

     

       36
       33
        
       

     

       37
       34
        
             glance = {

     

       38
       35
        
               enable = true;

     
···

       41
       38
        
               settings = {

     

       42
       39
        
                 pages = [

     

       43
       40
        
                   {

     

       44
       44
       -
                     name = publicNetwork.networkMap.glance.vHost;

     

       41
       41
       +
                     name = service.vHost;

     

       45
       42
        
                     width = "slim";

     

       46
       43
        
                     hide-desktop-navigation = true;

     

       47
       44
        
                     center-vertically = true;

-7

modules/snippets/aylac-top/default.nix

···

       18
       18
        
               forgejo = {

     

       19
       19
        
                 hostName = "nanpi";

     

       20
       20
        
                 port = 3001;

     

       21
       21
       -
                 sshVHost = "ssh.aylac.top";

     

       22
       21
        
                 vHost = "git.aylac.top";

     

       23
       22
        
               };

     

       24
       23
        
       

     
···

       44
       43
        
                 inherit (config.mySnippets.tailnet.networkMap.uptime-kuma) hostName;

     

       45
       44
        
                 inherit (config.mySnippets.tailnet.networkMap.uptime-kuma) port;

     

       46
       45
        
                 vHost = "status.aylac.top";

     

       47
       47
       -
               };

     

       48
       48
       -
       

     

       49
       49
       -
               glance = {

     

       50
       50
       -
                 inherit (config.mySnippets.tailnet.networkMap.glance) hostName;

     

       51
       51
       -
                 inherit (config.mySnippets.tailnet.networkMap.glance) port;

     

       52
       52
       -
                 vHost = "home.aylac.top";

     

       53
       46
        
               };

     

       54
       47
        
       

     

       55
       48
        
               tangled-knot = {