commit 216b880132bb5149cb58f2e14ce051f06fe8152c · aylac.top/nixcfg-own-knot

+2 -3

modules/nixos/profiles/backups/default.nix

···

       192
       192
        
               };

     

       193
       193
        
             }

     

       194
       194
        
             {

     

       195
       195
       -
               # damn this is ugly

     

       196
       195
        
               name = "postgresql";

     

       197
       196
        
               containerised = true;

     

       198
       198
       -
               inherit (config.myNixOS.services.postgresql) enable;

     

       199
       199
       -
               paths = ["/var/lib/nixos-containers/postgresql${config.containers.postgresql.config.services.postgresql.dataDir}"];

     

       197
       197
       +
               inherit (config.services.postgresql) enable;

     

       198
       198
       +
               paths = [config.services.postgresql.dataDir];

     

       200
       199
        
               backupMode = "quiet";

     

       201
       200
        
             }

     

       202
       201
        
             {

+5

modules/nixos/services/forgejo/default.nix

···

       210
       210
        
               system.stateVersion = "25.11";

     

       211
       211
        
             };

     

       212
       212
        
           };

     

       213
       213
       +
       

     

       214
       214
       +
           systemd.services."container@forgejo" = {

     

       215
       215
       +
             requires = ["postgresql.service"];

     

       216
       216
       +
             after = ["postgresql.service"];

     

       217
       217
       +
           };

     

       213
       218
        
         };

     

       214
       219
        
       }

+5

modules/nixos/services/miniflux/default.nix

···

       48
       48
        
               };

     

       49
       49
        
             };

     

       50
       50
        
           };

     

       51
       51
       +
       

     

       52
       52
       +
           systemd.services."miniflux" = {

     

       53
       53
       +
             requires = ["postgresql.service"];

     

       54
       54
       +
             after = ["postgresql.service"];

     

       55
       55
       +
           };

     

       51
       56
        
         };

     

       52
       57
        
       }

+18 -26

modules/nixos/services/postgresql/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         config,

     

       4
       4
        
         pkgs,

     

       5
       5
       -
         self,

     

       6
       5
        
         ...

     

       7
       6
        
       }: let

     

       8
       7
        
         name = "postgresql";

     
···

       17
       16
        
           };

     

       18
       17
        
         };

     

       19
       18
        
       

     

       20
       20
       -
         config.containers.postgresql = lib.mkIf cfg.enable {

     

       21
       21
       -
           autoStart = true;

     

       22
       22
       -
           config = {

     

       23
       23
       -
             imports = [self.nixosModules.locale-en-gb];

     

       24
       24
       -
       

     

       25
       25
       -
             services.postgresql = {

     

       26
       26
       -
               enable = true;

     

       27
       27
       -
               enableTCPIP = true;

     

       28
       28
       -
               package = pkgs.postgresql_16;

     

       29
       29
       -
       

     

       30
       30
       -
               ensureDatabases = cfg.databases;

     

       31
       31
       -
               ensureUsers =

     

       32
       32
       -
                 lib.map (dbName: {

     

       33
       33
       -
                   name = dbName;

     

       34
       34
       -
                   ensureDBOwnership = true;

     

       35
       35
       -
                 })

     

       36
       36
       -
                 cfg.databases;

     

       19
       19
       +
         config = lib.mkIf cfg.enable {

     

       20
       20
       +
           services.postgresql = {

     

       21
       21
       +
             enable = true;

     

       22
       22
       +
             enableTCPIP = true;

     

       23
       23
       +
             package = pkgs.postgresql_16;

     

       37
       24
        
       

     

       38
       38
       -
               authentication = lib.concatStringsSep "\n" (

     

       39
       39
       -
                 lib.map (dbName: ''

     

       40
       40
       -
                   host ${dbName} ${dbName} samehost trust

     

       41
       41
       -
                 '')

     

       42
       42
       -
                 cfg.databases

     

       43
       43
       -
               );

     

       44
       44
       -
             };

     

       25
       25
       +
             ensureDatabases = cfg.databases;

     

       26
       26
       +
             ensureUsers =

     

       27
       27
       +
               lib.map (dbName: {

     

       28
       28
       +
                 name = dbName;

     

       29
       29
       +
                 ensureDBOwnership = true;

     

       30
       30
       +
               })

     

       31
       31
       +
               cfg.databases;

     

       45
       32
        
       

     

       46
       46
       -
             system.stateVersion = "25.11";

     

       33
       33
       +
             authentication = lib.concatStringsSep "\n" (

     

       34
       34
       +
               lib.map (dbName: ''

     

       35
       35
       +
                 host ${dbName} ${dbName} samehost trust

     

       36
       36
       +
               '')

     

       37
       37
       +
               cfg.databases

     

       38
       38
       +
             );

     

       47
       39
        
           };

     

       48
       40
        
         };

     

       49
       41
        
       }