Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f0f0ec0734c6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9b7c57cdc8d1
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 14, 2018

  1. exhibitor: fix paths for zookeeper shell scripts to point to local fo… 

    …lders
    @DzmitrySudnik
    DzmitrySudnik committed Nov 14, 2018
    Copy the full SHA
    5517661 View commit details

  2. Merge pull request #50348 from DzmitrySudnik/exhibitor-service-fix 

    exhibitor: fix paths for zookeeper shell scripts
    @copumpkin
    copumpkin authored Nov 14, 2018
    Copy the full SHA
    9b7c57c View commit details
Showing with 3 additions and 0 deletions.
  1. +3 −0 nixos/modules/services/misc/exhibitor.nix
3 changes: 3 additions & 0 deletions nixos/modules/services/misc/exhibitor.nix
View file
Original file line number Diff line number Diff line change
@@ -405,6 +405,9 @@ in
cp -Rf ${pkgs.zookeeper}/* ${cfg.baseDir}/zookeeper
chown -R zookeeper ${cfg.baseDir}/zookeeper/conf
chmod -R u+w ${cfg.baseDir}/zookeeper/conf
replace_what=$(echo ${pkgs.zookeeper} | sed 's/[\/&]/\\&/g')
replace_with=$(echo ${cfg.baseDir}/zookeeper | sed 's/[\/&]/\\&/g')
sed -i 's/'"$replace_what"'/'"$replace_with"'/g' ${cfg.baseDir}/zookeeper/bin/zk*.sh
'';
};
users.users = singleton {