diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-28 12:20:59 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-28 12:20:59 +0100 |
| commit | 57ddc155fcdb5a419860dd4a6ed03deabcc162f2 (patch) | |
| tree | eb44f417d88b209821f8c8522eac90af195a8302 /nixos/modules | |
| parent | ed01e0ca4f57d8abc8fbb16f7387a4f553d3fc8a (diff) | |
| parent | f0da094b2e2e885e4c2ea7930583c6fa302add0f (diff) | |
| download | nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.gz nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.bz2 nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.lz nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.xz nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.tar.zst nixlib-57ddc155fcdb5a419860dd4a6ed03deabcc162f2.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/games/scummvm/default.nix
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/services/databases/redis.nix | 5 | ||||
| -rw-r--r-- | nixos/modules/virtualisation/virtualbox-image.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 480e1184ffa3..a039ad138f6f 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -234,9 +234,8 @@ in serviceConfig.Type = "oneshot"; script = '' - if ! test -e ${cfg.dbpath}; then - install -d -m0700 -o ${cfg.user} ${cfg.dbpath} - fi + install -d -m0700 -o ${cfg.user} ${cfg.dbpath} + chown -R ${cfg.user} ${cfg.dbpath} ''; }; diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 4f8ea2651007..3a598a1c7dc5 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -57,6 +57,8 @@ in { fn="$out/nixos-${config.system.nixosLabel}-${pkgs.stdenv.system}.ova" VBoxManage export "$vmName" --output "$fn" + rm -v $diskImage + mkdir -p $out/nix-support echo "file ova $fn" >> $out/nix-support/hydra-build-products ''; |