commit d69ca5d01441aa0b61bbdb78e8ec0a51f7b41ddb · pyrox.dev/nix

+2 -2

modules/nixos/services/forgejo-runner/default.nix

···

       37
       37
        
             };

     

       38
       38
        
           };

     

       39
       39
        
         };

     

       40
       40
       -
         cfg = config.pyrox.services.forgejo-runner;

     

       40
       40
       +
         cfg = config.py.services.forgejo-runner;

     

       41
       41
        
       in

     

       42
       42
        
       {

     

       43
       43
       -
         options.pyrox.services.forgejo-runner = {

     

       43
       43
       +
         options.py.services.forgejo-runner = {

     

       44
       44
        
           enable = lib.mkEnableOption "Forgejo Actions Runner configuration";

     

       45
       45
        
           tokenFile = lib.mkOption {

     

       46
       46
        
             type = lib.types.path;

+14 -10

systems/x86_64-linux/marvin/services/git.nix

···

       1
       1
       -
       {

     

       2
       2
       -
         config,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         ...

     

       5
       5
       -
       }: let

     

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

     

       2
       2
       +
       let

     

       6
       3
        
         cfg = config.services.forgejo.settings;

     

       7
       4
        
         age = config.age.secrets;

     

       8
       5
        
         stateDir = "/var/lib/forgejo";

     
···

       15
       12
        
         };

     

       16
       13
        
       

     

       17
       14
        
         d = lib.data.services.git;

     

       18
       18
       -
       in {

     

       19
       19
       -
         pyrox.services.forgejo-runner = {

     

       15
       15
       +
       in

     

       16
       16
       +
       {

     

       17
       17
       +
         py.services.forgejo-runner = {

     

       20
       18
        
           enable = true;

     

       21
       19
        
           tokenFile = age.forgejo-default-runner-token.path;

     

       22
       20
        
         };

     
···

       34
       32
        
               APP_NAME = "PyroNet Git";

     

       35
       33
        
               RUN_MODE = "prod";

     

       36
       34
        
             };

     

       37
       37
       -
             attachment = {MAX_SIZE = 200;};

     

       35
       35
       +
             attachment = {

     

       36
       36
       +
               MAX_SIZE = 200;

     

       37
       37
       +
             };

     

       38
       38
        
             mailer = {

     

       39
       39
        
               ENABLED = true;

     

       40
       40
        
               FROM = "PyroNet Git <git@pyrox.dev>";

     
···

       43
       43
        
               SMTP_PORT = 465;

     

       44
       44
        
               USER = "git@pyrox.dev";

     

       45
       45
        
             };

     

       46
       46
       -
             picture = {ENABLE_FEDERATED_AVATAR = true;};

     

       46
       46
       +
             picture = {

     

       47
       47
       +
               ENABLE_FEDERATED_AVATAR = true;

     

       48
       48
       +
             };

     

       47
       49
        
             ui = {

     

       48
       50
        
               DEFAULT_SHOW_FULL_NAME = true;

     

       49
       51
        
               DEFAULT_THEME = "catppuccin-mocha-blue";

     
···

       54
       56
        
               AUTHOR = "Pyrox";

     

       55
       57
        
               DESCRIPTION = "PyroNet Git Services";

     

       56
       58
        
             };

     

       57
       57
       -
             metrics = {ENABLED = true;};

     

       59
       59
       +
             metrics = {

     

       60
       60
       +
               ENABLED = true;

     

       61
       61
       +
             };

     

       58
       62
        
             server = {

     

       59
       63
        
               DISABLE_SSH = true;

     

       60
       64
        
               DOMAIN = d.extUrl;