commit 187b47bbc28620ad876f1c2ea13db50d82dba674 · soopy.moe/gensokyo

+5 -2

global/programs/security/kanidm.nix

···

       1
       1
        
       {

     

       2
       2
       -
         services.kanidm.clientSettings = {

     

       3
       3
       -
           uri = "https://serenity.mist-nessie.ts.net";

     

       2
       2
       +
         services.kanidm = {

     

       3
       3
       +
           enableClient = true;

     

       4
       4
       +
           clientSettings = {

     

       5
       5
       +
             uri = "https://serenity.mist-nessie.ts.net";

     

       6
       6
       +
           };

     

       4
       7
        
         };

     

       5
       8
        
       }

+4 -1

systems/koumakan/services/security/pocket-id.nix

···

       7
       7
        
       let

     

       8
       8
        
         secrets = _utils.setupSecrets config {

     

       9
       9
        
           namespace = "pocket-id";

     

       10
       10
       -
           secrets = [ "encryption_key" "maxmind_key" ];

     

       10
       10
       +
           secrets = [

     

       11
       11
       +
             "encryption_key"

     

       12
       12
       +
             "maxmind_key"

     

       13
       13
       +
           ];

     

       11
       14
        
           config = {

     

       12
       15
        
             owner = config.users.users.pocket-id.name;

     

       13
       16
        
           };

+20 -18

systems/koumakan/services/storage/backup.nix

···

       21
       21
        
         system.activationScripts.initBackupHome = {

     

       22
       22
        
           deps = [ "users" ];

     

       23
       23
        
           supportsDryActivation = false;

     

       24
       24
       -
           text = let

     

       25
       25
       -
             btrfs = lib.getExe pkgs.btrfs-progs;

     

       26
       26
       -
           in ''

     

       27
       27
       -
             ensureSubvolume() {

     

       28
       28
       -
               mode=$1; shift

     

       29
       29
       -
               dir=$1; shift

     

       24
       24
       +
           text =

     

       25
       25
       +
             let

     

       26
       26
       +
               btrfs = lib.getExe pkgs.btrfs-progs;

     

       27
       27
       +
             in

     

       28
       28
       +
             ''

     

       29
       29
       +
               ensureSubvolume() {

     

       30
       30
       +
                 mode=$1; shift

     

       31
       31
       +
                 dir=$1; shift

     

       30
       32
        
       

     

       31
       31
       -
               if test ! -e $dir; then

     

       32
       32
       -
                 ${btrfs} subvolume create $dir

     

       33
       33
       -
               fi

     

       34
       34
       -
               chown backup:backup $dir

     

       35
       35
       -
               chmod $mode $dir

     

       36
       36
       -
             }

     

       33
       33
       +
                 if test ! -e $dir; then

     

       34
       34
       +
                   ${btrfs} subvolume create $dir

     

       35
       35
       +
                 fi

     

       36
       36
       +
                 chown backup:backup $dir

     

       37
       37
       +
                 chmod $mode $dir

     

       38
       38
       +
               }

     

       37
       39
        
       

     

       38
       38
       -
             ensureSubvolume 550 /home/backup

     

       39
       39
       -
             ensureSubvolume 700 /home/backup/private

     

       40
       40
       -
             ensureSubvolume 700 /home/backup/private/snapshots

     

       41
       41
       -
             ensureSubvolume 755 /home/backup/public

     

       42
       42
       -
             ensureSubvolume 755 /home/backup/public/snapshots

     

       43
       43
       -
           '';

     

       40
       40
       +
               ensureSubvolume 550 /home/backup

     

       41
       41
       +
               ensureSubvolume 700 /home/backup/private

     

       42
       42
       +
               ensureSubvolume 700 /home/backup/private/snapshots

     

       43
       43
       +
               ensureSubvolume 755 /home/backup/public

     

       44
       44
       +
               ensureSubvolume 755 /home/backup/public/snapshots

     

       45
       45
       +
             '';

     

       44
       46
        
         };

     

       45
       47
        
       

     

       46
       48
        
         systemd = {

+3 -2

systems/renko/services/backup-servers.nix

···

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

     

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

     

       2
       2
       +
       {

     

       2
       3
        
         systemd.user = {

     

       3
       4
        
           timers.backup-2025 = {

     

       4
       5
        
             wantedBy = lib.singleton "default.target";

     
···

       31
       32
        
                 --verbose \

     

       32
       33
        
                 $SOURCE \

     

       33
       34
        
                 $DESTINATION

     

       34
       34
       -
           '';

     

       35
       35
       +
             '';

     

       35
       36
        
           };

     

       36
       37
        
         };

     

       37
       38
        
       }