commit 7ec347f01749318cdf716db56a48c24fb0bf2ed4 · dunkirk.sh/dots

+4 -4

modules/nixos/services/cachet.nix

···

       75
       75
        
             path = [ pkgs.git ];

     

       76
       76
        
       

     

       77
       77
        
             preStart = ''

     

       78
       78
       -
               cd ${cfg.dataDir}/app

     

       79
       79
       -
               

     

       80
       80
       -
               if [ ! -d .git ]; then

     

       81
       81
       -
                 ${pkgs.git}/bin/git clone ${cfg.repository} .

     

       78
       78
       +
               if [ ! -d ${cfg.dataDir}/app/.git ]; then

     

       79
       79
       +
                 ${pkgs.git}/bin/git clone ${cfg.repository} ${cfg.dataDir}/app

     

       82
       80
        
               fi

     

       81
       81
       +
               

     

       82
       82
       +
               cd ${cfg.dataDir}/app

     

       83
       83
        
             '' + lib.optionalString cfg.autoUpdate ''

     

       84
       84
        
               ${pkgs.git}/bin/git pull

     

       85
       85
        
             '' + ''

+4 -13

modules/nixos/services/hn-alerts.nix

···

       75
       75
        
             path = [ pkgs.git ];

     

       76
       76
        
       

     

       77
       77
        
             preStart = ''

     

       78
       78
       -
               cd ${cfg.dataDir}/app

     

       79
       79
       -
               

     

       80
       80
       -
               if [ ! -d .git ]; then

     

       81
       81
       -
                 ${pkgs.git}/bin/git clone ${cfg.repository} .

     

       78
       78
       +
               if [ ! -d ${cfg.dataDir}/app/.git ]; then

     

       79
       79
       +
                 ${pkgs.git}/bin/git clone ${cfg.repository} ${cfg.dataDir}/app

     

       82
       80
        
               fi

     

       81
       81
       +
               

     

       82
       82
       +
               cd ${cfg.dataDir}/app

     

       83
       83
        
             '' + lib.optionalString cfg.autoUpdate ''

     

       84
       84
        
               ${pkgs.git}/bin/git pull

     

       85
       85
        
             '' + ''

     
···

       109
       109
        
               Restart = "always";

     

       110
       110
        
               RestartSec = "10s";

     

       111
       111
        
             };

     

       112
       112
       -
       

     

       113
       113
       -
             serviceConfig.ExecStartPre = [

     

       114
       114
       -
               "+${pkgs.writeShellScript "hn-alerts-setup" ''

     

       115
       115
       -
                 mkdir -p ${cfg.dataDir}/data

     

       116
       116
       -
                 mkdir -p ${cfg.dataDir}/app

     

       117
       117
       -
                 chown -R hn-alerts:services ${cfg.dataDir}

     

       118
       118
       -
                 chmod -R g+rwX ${cfg.dataDir}

     

       119
       119
       -
               ''}"

     

       120
       120
       -
             ];

     

       121
       112
        
           };

     

       122
       113
        
       

     

       123
       114
        
           services.caddy.virtualHosts.${cfg.domain} = {