diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2019-09-10 11:40:39 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-10-12 15:07:27 -0700 |
commit | 5e8ae589a47a6206fc22ca306454cdb6f4d539be (patch) | |
tree | ffb645b27d0f42aac3bc10ce3c30cef2b973aa26 /nixos/tests/nextcloud | |
parent | a8b2e302c66f6e1c2186508aef58526976804ed3 (diff) | |
download | nixpkgs-5e8ae589a47a6206fc22ca306454cdb6f4d539be.tar nixpkgs-5e8ae589a47a6206fc22ca306454cdb6f4d539be.tar.gz nixpkgs-5e8ae589a47a6206fc22ca306454cdb6f4d539be.tar.bz2 nixpkgs-5e8ae589a47a6206fc22ca306454cdb6f4d539be.tar.lz nixpkgs-5e8ae589a47a6206fc22ca306454cdb6f4d539be.tar.xz nixpkgs-5e8ae589a47a6206fc22ca306454cdb6f4d539be.tar.zst nixpkgs-5e8ae589a47a6206fc22ca306454cdb6f4d539be.zip |
nixos/nextcloud: fix postgresql/redis test
Diffstat (limited to 'nixos/tests/nextcloud')
-rw-r--r-- | nixos/tests/nextcloud/with-postgresql-and-redis.nix | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 81c269c2378..25de915c953 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -27,7 +27,7 @@ in { dbtype = "pgsql"; dbname = "nextcloud"; dbuser = "nextcloud"; - dbhost = "/run/postgresql"; + dbhost = "localhost:5432"; inherit adminuser; adminpassFile = toString (pkgs.writeText "admin-pass-file" '' ${adminpass} @@ -36,49 +36,16 @@ in { }; services.redis = { - unixSocket = "/var/run/redis/redis.sock"; enable = true; - extraConfig = '' - unixsocketperm 770 - ''; - }; - - systemd.services.redis = { - preStart = '' - mkdir -p /var/run/redis - chown ${config.services.redis.user}:${config.services.nginx.group} /var/run/redis - ''; - serviceConfig.PermissionsStartOnly = true; }; systemd.services.nextcloud-setup= { requires = ["postgresql.service"]; after = [ "postgresql.service" - "chown-redis-socket.service" ]; }; - # At the time of writing, redis creates its socket with the "nobody" - # group. I figure this is slightly less bad than making the socket world - # readable. - systemd.services.chown-redis-socket = { - enable = true; - script = '' - until ${pkgs.redis}/bin/redis-cli ping; do - echo "waiting for redis..." - sleep 1 - done - chown ${config.services.redis.user}:${config.services.nginx.group} /var/run/redis/redis.sock - ''; - after = [ "redis.service" ]; - requires = [ "redis.service" ]; - wantedBy = [ "redis.service" ]; - serviceConfig = { - Type = "oneshot"; - }; - }; - services.postgresql = { enable = true; ensureDatabases = [ "nextcloud" ]; @@ -94,7 +61,7 @@ in { testScript = let configureRedis = pkgs.writeScript "configure-redis" '' #!${pkgs.stdenv.shell} - nextcloud-occ config:system:set redis 'host' --value '/var/run/redis/redis.sock' --type string + nextcloud-occ config:system:set redis 'host' --value 'localhost:6379' --type string nextcloud-occ config:system:set redis 'port' --value 0 --type integer nextcloud-occ config:system:set memcache.local --value '\OC\Memcache\Redis' --type string nextcloud-occ config:system:set memcache.locking --value '\OC\Memcache\Redis' --type string |