commit b4310d5e07a358cd8c2eecb80289b41ac5d25d66 · sapphic.moe/flake

secrets/caddy.env.age secrets/caddy.age

+1 -1

secrets/secrets.nix

···

       8
       8
        
         ];

     

       9
       9
        
       in

     

       10
       10
        
       {

     

       11
       11
       -
         "caddy.env.age".publicKeys = keys;

     

       11
       11
       +
         "caddy.age".publicKeys = keys;

     

       12
       12
        
       }

+4 -4

services/caddy/default.nix

···

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

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
       -
         age.secrets.caddy_env = {

     

       5
       5
       -
           file = ../../secrets/caddy.env.age;

     

       4
       4
       +
         age.secrets.caddy = {

     

       5
       5
       +
           file = ../../secrets/caddy.age;

     

       6
       6
        
           mode = "600";

     

       7
       7
        
         };

     

       8
       8
        
       

     
···

       12
       12
        
             plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];

     

       13
       13
        
             hash = "sha256-XwZ0Hkeh2FpQL/fInaSq+/3rCLmQRVvwBM0Y1G1FZNU=";

     

       14
       14
        
           };

     

       15
       15
       -
           environmentFile = config.age.secrets.caddy_env.path;

     

       15
       15
       +
           environmentFile = config.age.secrets.caddy.path;

     

       16
       16
        
           globalConfig = ''

     

       17
       17
        
             email chloe@sapphic.moe

     

       18
       18
        
           '';

     
···

       30
       30
        
         };

     

       31
       31
        
       

     

       32
       32
        
         systemd.services.caddy.serviceConfig = {

     

       33
       33
       -
           EnvironmentFile = config.age.secrets.caddy_env.path;

     

       33
       33
       +
           EnvironmentFile = config.age.secrets.caddy.path;

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         settings.firewall.allowedTCPPorts = [