commit 1207b23cc25747ac8dd4f55e28c37221365af891 · pyrox.dev/nixpkgs

+31 -15
nixos/modules/services/misc/gitlab.nix
···

       18
       18
        
         gitalySocket = "${cfg.statePath}/tmp/sockets/gitaly.socket";

     

       19
       19
        
         pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;

     

       20
       20
        
       

     

       21
       21
       +
         gitlabVersionAtLeast = version: lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) version;

     

       22
       22
       +
       

     

       21
       23
        
         databaseConfig = let

     

       22
       24
        
           val = {

     

       23
       25
        
             adapter = "postgresql";

     
···

       27
       29
        
             encoding = "utf8";

     

       28
       30
        
             pool = cfg.databasePool;

     

       29
       31
        
           } // cfg.extraDatabaseConfig;

     

       30
       30
       -
         in if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then {

     

       31
       31
       -
           production.main = val;

     

       32
       32
       -
         } else {

     

       33
       33
       -
           production = val;

     

       32
       32
       +
         in {

     

       33
       33
       +
           production = (

     

       34
       34
       +
             if (gitlabVersionAtLeast "15.0")

     

       35
       35
       +
             then { main = val; }

     

       36
       36
       +
             else val

     

       37
       37
       +
           ) // lib.optionalAttrs (gitlabVersionAtLeast "15.9") {

     

       38
       38
       +
             ci = val // {

     

       39
       39
       +
               database_tasks = false;

     

       40
       40
       +
             };

     

       41
       41
       +
           };

     

       34
       42
        
         };

     

       35
       43
        
       

     

       36
       44
        
         # We only want to create a database if we're actually going to connect to it.

     
···

       1168
       1176
        
               set -eu

     

       1169
       1177
        
       

     

       1170
       1178
        
               PSQL() {

     

       1171
       1171
       -
                   psql --port=${toString pgsql.port} "$@"

     

       1179
       1179
       +
                   psql --port=${toString pgsql.settings.port} "$@"

     

       1172
       1180
        
               }

     

       1173
       1181
        
       

     

       1174
       1182
        
               PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"'

     
···

       1348
       1356
        
       

     

       1349
       1357
        
                   rm -f '${cfg.statePath}/config/database.yml'

     

       1350
       1358
        
       

     

       1351
       1351
       -
                   ${if cfg.databasePasswordFile != null then ''

     

       1359
       1359
       +
                   ${lib.optionalString (cfg.databasePasswordFile != null) ''

     

       1352
       1360
        
                       db_password="$(<'${cfg.databasePasswordFile}')"

     

       1353
       1361
        
                       export db_password

     

       1354
       1362
        
       

     
···

       1356
       1364
        
                         >&2 echo "Database password was an empty string!"

     

       1357
       1365
        
                         exit 1

     

       1358
       1366
        
                       fi

     

       1367
       1367
       +
                   ''}

     

       1359
       1368
        
       

     

       1360
       1360
       -
                       jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \

     

       1361
       1361
       -
                          '.${if lib.versionAtLeast (lib.getVersion cfg.packages.gitlab) "15.0" then "production.main" else "production"}.password = $ENV.db_password' \

     

       1362
       1362
       -
                          >'${cfg.statePath}/config/database.yml'

     

       1363
       1363
       -
                     ''

     

       1364
       1364
       -
                     else ''

     

       1365
       1365
       -
                       jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} \

     

       1366
       1366
       -
                          >'${cfg.statePath}/config/database.yml'

     

       1367
       1367
       -
                     ''

     

       1368
       1368
       -
                   }

     

       1369
       1369
       +
                   # GitLab expects the `production.main` section to be the first entry in the file.

     

       1370
       1370
       +
                   jq <${pkgs.writeText "database.yml" (builtins.toJSON databaseConfig)} '{

     

       1371
       1371
       +
                     production: [

     

       1372
       1372
       +
                       ${lib.optionalString (cfg.databasePasswordFile != null) (

     

       1373
       1373
       +
                         builtins.concatStringsSep "\n      " (

     

       1374
       1374
       +
                           [ ".production${lib.optionalString (gitlabVersionAtLeast "15.0") ".main"}.password = $ENV.db_password" ]

     

       1375
       1375
       +
                           ++ lib.optional (gitlabVersionAtLeast "15.9") "| .production.ci.password = $ENV.db_password"

     

       1376
       1376
       +
                           ++ [ "|" ]

     

       1377
       1377
       +
                         )

     

       1378
       1378
       +
                       )} .production

     

       1379
       1379
       +
                       | to_entries[]

     

       1380
       1380
       +
                     ]

     

       1381
       1381
       +
                     | sort_by(.key)

     

       1382
       1382
       +
                     | reverse

     

       1383
       1383
       +
                     | from_entries

     

       1384
       1384
       +
                   }' >'${cfg.statePath}/config/database.yml'

     

       1369
       1385
        
       

     

       1370
       1386
        
                   ${utils.genJqSecretsReplacementSnippet

     

       1371
       1387
        
                       gitlabConfig