nixos/ocis: default to the newly renamed ocis-bin5 package
And we are getting ready for ocis-bin7 to land, where we will need to compare it to the system.stateVersion.
This commit is contained in:
@@ -37,7 +37,7 @@ However to make this configuration work you will need generate a configuration.
|
||||
You can do this with:
|
||||
|
||||
```console
|
||||
$ nix-shell -p ocis-bin
|
||||
$ nix-shell -p ocis_5-bin
|
||||
$ mkdir scratch/
|
||||
$ cd scratch/
|
||||
$ ocis init --config-path . --admin-password "changeme"
|
||||
|
||||
@@ -16,7 +16,11 @@ in
|
||||
services.ocis = {
|
||||
enable = lib.mkEnableOption "ownCloud Infinite Scale";
|
||||
|
||||
package = lib.mkPackageOption pkgs "ocis-bin" { };
|
||||
package = lib.mkOption {
|
||||
type = types.package;
|
||||
description = "Which package to use for the ownCloud Infinite Scale instance.";
|
||||
relatedPackages = [ "ocis_5-bin" ];
|
||||
};
|
||||
|
||||
configDir = lib.mkOption {
|
||||
type = types.nullOr types.path;
|
||||
@@ -137,6 +141,8 @@ in
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
services.ocis.package = lib.mkDefault pkgs.ocis_5-bin;
|
||||
|
||||
users.users.${defaultUser} = lib.mkIf (cfg.user == defaultUser) {
|
||||
group = cfg.group;
|
||||
home = cfg.stateDir;
|
||||
|
||||
@@ -205,7 +205,7 @@ import ./make-test-python.nix (
|
||||
machine.sleep(5)
|
||||
|
||||
with subtest("ocis bin works"):
|
||||
machine.succeed("${lib.getExe pkgs.ocis-bin} version")
|
||||
machine.succeed("${lib.getExe pkgs.ocis_5-bin} version")
|
||||
|
||||
with subtest("use the web interface to log in with a demo user"):
|
||||
machine.succeed("PYTHONUNBUFFERED=1 systemd-cat -t test-runner test-runner ${demoUser} ${demoPassword}")
|
||||
|
||||
Reference in New Issue
Block a user