diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-06-01 22:06:21 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-01 22:06:21 +0200 |
commit | 87ee5896fb46203ca26af9b22c6b524cc1de195f (patch) | |
tree | b785f44470bc8cf62c8087cce7e0b3b03cc361e7 /nixos/modules/services/network-filesystems | |
parent | f30dd71a388b327102a8bbc628aed1b04488e44d (diff) | |
parent | 13eefe13cd719f2d028d87a895b39189da5c8653 (diff) | |
download | nixlib-87ee5896fb46203ca26af9b22c6b524cc1de195f.tar nixlib-87ee5896fb46203ca26af9b22c6b524cc1de195f.tar.gz nixlib-87ee5896fb46203ca26af9b22c6b524cc1de195f.tar.bz2 nixlib-87ee5896fb46203ca26af9b22c6b524cc1de195f.tar.lz nixlib-87ee5896fb46203ca26af9b22c6b524cc1de195f.tar.xz nixlib-87ee5896fb46203ca26af9b22c6b524cc1de195f.tar.zst nixlib-87ee5896fb46203ca26af9b22c6b524cc1de195f.zip |
Merge pull request #25709 from nh2/25620-glusterfs-fix-python-import-errors
Fix: GlusterFS python tools all have import errors
Diffstat (limited to 'nixos/modules/services/network-filesystems')
-rw-r--r-- | nixos/modules/services/network-filesystems/glusterfs.nix | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index a2f2c0339515..f7fed793066a 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -3,7 +3,7 @@ with lib; let - inherit (pkgs) glusterfs; + inherit (pkgs) glusterfs rsync; cfg = config.services.glusterfs; @@ -50,8 +50,11 @@ in after = [ "rpcbind.service" "network.target" "local-fs.target" ]; before = [ "network-online.target" ]; + # The copying of hooks is due to upstream bug https://bugzilla.redhat.com/show_bug.cgi?id=1452761 preStart = '' install -m 0755 -d /var/log/glusterfs + mkdir -p /var/lib/glusterd/hooks/ + ${rsync}/bin/rsync -a ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/ ''; serviceConfig = { |