interdiff of round #3 and #2 · pull #71 · freshlybakedca.ke/patisserie

REVERTED

packetmix/systems/umber/acme.nix

···

       1
       1
       -
       # SPDX-FileCopyrightText: 2025 FreshlyBakedCake

     

       2
       2
       -
       #

     

       3
       3
       -
       # SPDX-License-Identifier: MIT

     

       4
       4
       -
       

     

       5
       5
       -
       {

     

       6
       6
       -
         security.acme = {

     

       7
       7
       -
           acceptTerms = true;

     

       8
       8
       -
           defaults = {

     

       9
       9
       -
             email = "acme@starrysky.fyi";

     

       10
       10
       -
             dnsProvider = "cloudflare";

     

       11
       11
       -
             environmentFile = "/secrets/acme/environmentFile";

     

       12
       12
       -
           };

     

       13
       13
       -
         };

     

       14
       14
       -
       

     

       15
       15
       -
         clicks.storage.impermanence.persist.directories = [ "/var/lib/acme" ];

     

       16
       16
       -
       }

REVERTED

packetmix/systems/umber/silverbullet.nix

···

       1
       1
       -
       # SPDX-FileCopyrightText: 2025 FreshlyBakedCake

     

       2
       2
       -
       #

     

       3
       3
       -
       # SPDX-License-Identifier: MIT

     

       4
       4
       -
       

     

       5
       5
       -
       {

     

       6
       6
       -
         project,

     

       7
       7
       -
         system,

     

       8
       8
       -
         config,

     

       9
       9
       -
         ...

     

       10
       10
       -
       }:

     

       11
       11
       -
       {

     

       12
       12
       -
         clicks.storage.impermanence.persist.directories = [

     

       13
       13
       -
           {

     

       14
       14
       -
             directory = config.services.silverbullet.spaceDir;

     

       15
       15
       -
             mode = "0700";

     

       16
       16
       -
             defaultPerms.mode = "0700";

     

       17
       17
       -
           }

     

       18
       18
       -
         ];

     

       19
       19
       -
       

     

       20
       20
       -
         services.silverbullet = {

     

       21
       21
       -
           enable = true;

     

       22
       22
       -
           listenPort = 1024;

     

       23
       23
       -
           listenAddress = "127.0.0.1";

     

       24
       24
       -
           package = project.inputs.nixos-unstable.result.${system}.silverbullet;

     

       25
       25
       -
         };

     

       26
       26
       -
       

     

       27
       27
       -
         services.nginx.enable = true;

     

       28
       28
       -
         services.nginx.virtualHosts."silverbullet.starrysky.fyi" = {

     

       29
       29
       -
           listenAddresses = [ "localhost.tailscale" ];

     

       30
       30
       -
       

     

       31
       31
       -
           addSSL = true;

     

       32
       32
       -
           enableACME = true;

     

       33
       33
       -
           acmeRoot = null;

     

       34
       34
       -
       

     

       35
       35
       -
           serverAliases = [ "umber.clicks.domains" ];

     

       36
       36
       -
       

     

       37
       37
       -
           locations."/" = {

     

       38
       38
       -
             proxyPass = "http://$silverbullet_upstream_minion_only";

     

       39
       39
       -
             recommendedProxySettings = true;

     

       40
       40
       -
           };

     

       41
       41
       -
         };

     

       42
       42
       -
       

     

       43
       43
       -
         services.nginx.virtualHosts."silverbullet_access_denied" = {

     

       44
       44
       -
           listen = [

     

       45
       45
       -
             {

     

       46
       46
       -
               addr = "127.0.0.1";

     

       47
       47
       -
               port = 403;

     

       48
       48
       -
             }

     

       49
       49
       -
           ];

     

       50
       50
       -
           locations."/".return =

     

       51
       51
       -
             ''403 '403 - Access Denied: Your device is logged on to tailscale as '$http_x_webauth_user'. Unfortunately, this is a private silverbullet instance for 'minion', please use https://silverbullet.clicks.codes instead' '';

     

       52
       52
       -
         };

     

       53
       53
       -
       

     

       54
       54
       -
         services.nginx.commonHttpConfig = ''

     

       55
       55
       -
           map $auth_user $silverbullet_upstream_minion_only {

     

       56
       56
       -
             default 127.0.0.1:403;

     

       57
       57
       -
             minion 127.0.0.1:1024;

     

       58
       58
       -
           }

     

       59
       59
       -
         '';

     

       60
       60
       -
       

     

       61
       61
       -
         services.nginx.tailscaleAuth = {

     

       62
       62
       -
           enable = true;

     

       63
       63
       -
           virtualHosts = [ "silverbullet.starrysky.fyi" ];

     

       64
       64
       -
         };

     

       65
       65
       -
       }

REVERTED

packetmix/systems/umber/tailscale.nix

···

       1
       1
       -
       # SPDX-FileCopyrightText: 2025 FreshlyBakedCake

     

       2
       2
       -
       #

     

       3
       3
       -
       # SPDX-License-Identifier: MIT

     

       4
       4
       -
       

     

       5
       5
       -
       {

     

       6
       6
       -
         networking.hosts."100.64.0.48" = [ "localhost.tailscale" ];

     

       7
       7
       -
       

     

       8
       8
       -
         services.nginx.defaultListenAddresses = [

     

       9
       9
       -
           "0.0.0.0"

     

       10
       10
       -
           "[::0]"

     

       11
       11
       -
           "localhost.tailscale"

     

       12
       12
       -
         ];

     

       13
       13
       -
       }

ERROR

packetmix/workspace.josh.license

Failed to calculate interdiff for this file.

ERROR

packetmix/systems/server/zsh.nix

Failed to calculate interdiff for this file.