fix: move the fixing of the path to the package and not teh module
This commit is contained in:
parent
f8826c5d2f
commit
b742a09c43
2 changed files with 7 additions and 9 deletions
|
@ -115,13 +115,6 @@ in {
|
||||||
mkdir -p $SPLUNK_HOME/etc/apps/000_ul_umbrio_essentials/local/
|
mkdir -p $SPLUNK_HOME/etc/apps/000_ul_umbrio_essentials/local/
|
||||||
cp ${deployment_client} $SPLUNK_HOME/etc/apps/000_ul_umbrio_essentials/local/deploymentclient.conf
|
cp ${deployment_client} $SPLUNK_HOME/etc/apps/000_ul_umbrio_essentials/local/deploymentclient.conf
|
||||||
|
|
||||||
|
|
||||||
# Splunk is doing a crime by deciding what teh path is, need to comment out this line
|
|
||||||
# in /bin/pid_check.sh
|
|
||||||
# PATH=/usr/xpg4/bin:/usr/bin:/bin
|
|
||||||
# PATH=
|
|
||||||
sed -i -e 's/PATH=/#PATH=/g' ${cfg.user.home}/bin/pid_check.sh
|
|
||||||
|
|
||||||
# make sure user permissions are correct
|
# make sure user permissions are correct
|
||||||
chmod 771 -R ${cfg.user.home}
|
chmod 771 -R ${cfg.user.home}
|
||||||
chown ${cfg.user.user}:${cfg.user.group} -R ${cfg.user.home}
|
chown ${cfg.user.user}:${cfg.user.group} -R ${cfg.user.home}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
stdenv,
|
stdenv,
|
||||||
lib,
|
lib,
|
||||||
fetchurl,
|
fetchurl,
|
||||||
#, alsa-lib
|
gnused,
|
||||||
openssl,
|
openssl,
|
||||||
zlib,
|
zlib,
|
||||||
autoPatchelfHook,
|
autoPatchelfHook,
|
||||||
|
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
|
||||||
# alsaLib
|
# alsaLib
|
||||||
openssl
|
openssl
|
||||||
zlib
|
zlib
|
||||||
|
gnused
|
||||||
];
|
];
|
||||||
|
|
||||||
sourceRoot = ".";
|
sourceRoot = ".";
|
||||||
|
@ -30,8 +31,12 @@ stdenv.mkDerivation rec {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
runHook preInstall
|
runHook preInstall
|
||||||
# gets unzipped and we just pop it all into teh output
|
# gets unzipped and we just pop it all into teh output
|
||||||
# might add the patching of the path vars in the scripts to be here
|
|
||||||
cp -R ./splunkforwarder $out
|
cp -R ./splunkforwarder $out
|
||||||
|
|
||||||
|
# Splunk is doing a crime by deciding what teh path is, need to comment out this line in /bin/pid_check.sh
|
||||||
|
# PATH=/usr/xpg4/bin:/usr/bin:/bin
|
||||||
|
find $out -type f -name "*.sh" -print0 | xargs -0 sed -i -e 's/PATH=/#PATH=/g'
|
||||||
|
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue