diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2019-06-13 01:01:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-13 01:01:18 +0200 |
| commit | 401360e15b6b48f8e144a0062880b137ef7c532c (patch) | |
| tree | 46e4e4081a079ca4c0ffe2b92e432ef4ea70f5e7 /nixos/tests | |
| parent | 57301d9b2fc8e2f8fad375cb5ae8256e0988b6a7 (diff) | |
| parent | 7145cf224c3eb45985d9bfc483c9e13c16fdaa91 (diff) | |
| download | nixpkgs-401360e15b6b48f8e144a0062880b137ef7c532c.tar nixpkgs-401360e15b6b48f8e144a0062880b137ef7c532c.tar.gz nixpkgs-401360e15b6b48f8e144a0062880b137ef7c532c.tar.bz2 nixpkgs-401360e15b6b48f8e144a0062880b137ef7c532c.tar.lz nixpkgs-401360e15b6b48f8e144a0062880b137ef7c532c.tar.xz nixpkgs-401360e15b6b48f8e144a0062880b137ef7c532c.tar.zst nixpkgs-401360e15b6b48f8e144a0062880b137ef7c532c.zip | |
Merge pull request #61923 from aanderse/gitea
nixos/gitea: make use of declarative features where applicable
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/gitea.nix | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/nixos/tests/gitea.nix b/nixos/tests/gitea.nix index cccf8c7cd44..b8ab6dabc8c 100644 --- a/nixos/tests/gitea.nix +++ b/nixos/tests/gitea.nix @@ -13,18 +13,8 @@ with pkgs.lib; machine = { config, pkgs, ... }: - { services.mysql.enable = true; - services.mysql.package = pkgs.mariadb; - services.mysql.ensureDatabases = [ "gitea" ]; - services.mysql.ensureUsers = [ - { name = "gitea"; - ensurePermissions = { "gitea.*" = "ALL PRIVILEGES"; }; - } - ]; - - services.gitea.enable = true; + { services.gitea.enable = true; services.gitea.database.type = "mysql"; - services.gitea.database.socket = "/run/mysqld/mysqld.sock"; }; testScript = '' @@ -42,10 +32,8 @@ with pkgs.lib; machine = { config, pkgs, ... }: - { - services.gitea.enable = true; + { services.gitea.enable = true; services.gitea.database.type = "postgres"; - services.gitea.database.passwordFile = pkgs.writeText "db-password" "secret"; }; testScript = '' |