Remove old event source registry key
Signed-off-by: Jan-Otto Kröpke <mail@jkroepke.de>
This commit is contained in:
parent
48cb97d7d3
commit
63e7fa3054
|
@ -24,7 +24,25 @@
|
||||||
<Property Id="REMOTE_ADDR" Secure="yes" />
|
<Property Id="REMOTE_ADDR" Secure="yes" />
|
||||||
<SetProperty Id="RemoteAddressFlag" After="InstallFiles" Sequence="execute" Value="[REMOTE_ADDR]" Condition="REMOTE_ADDR" />
|
<SetProperty Id="RemoteAddressFlag" After="InstallFiles" Sequence="execute" Value="[REMOTE_ADDR]" Condition="REMOTE_ADDR" />
|
||||||
|
|
||||||
|
<!-- https://github.com/prometheus-community/windows_exporter/issues/1318 -->
|
||||||
|
<!-- https://wixtoolset.org/docs/tools/wixext/quietexec/ -->
|
||||||
|
<SetProperty
|
||||||
|
Id="WixQuietExecCmdLine"
|
||||||
|
Value=""[%ComSpec]" /c reg delete HKLM\SYSTEM\CurrentControlSet\Services\EventLog\Application\windows_exporter /f"
|
||||||
|
Before="ConvolutedCoreCountCustomAction"
|
||||||
|
Sequence="execute"
|
||||||
|
/>
|
||||||
|
<CustomAction
|
||||||
|
Id="RemoveEventSource"
|
||||||
|
BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)"
|
||||||
|
DllEntry="WixSilentExec"
|
||||||
|
Execute="deferred"
|
||||||
|
Impersonate="no"
|
||||||
|
Return="ignore"
|
||||||
|
/>
|
||||||
|
<InstallExecuteSequence>
|
||||||
|
<Custom Action="RemoveEventSource" After="InstallInitialize" />
|
||||||
|
</InstallExecuteSequence>
|
||||||
|
|
||||||
<Property Id="TEXTFILE_DIR" Secure="yes" />
|
<Property Id="TEXTFILE_DIR" Secure="yes" />
|
||||||
<SetProperty Id="TextfileDirFlag" After="InstallFiles" Sequence="execute" Value="--collector.textfile.directory [TEXTFILE_DIR]" Condition="TEXTFILE_DIR" />
|
<SetProperty Id="TextfileDirFlag" After="InstallFiles" Sequence="execute" Value="--collector.textfile.directory [TEXTFILE_DIR]" Condition="TEXTFILE_DIR" />
|
||||||
|
@ -51,11 +69,11 @@
|
||||||
<Feature Id="DefaultFeature" Level="1">
|
<Feature Id="DefaultFeature" Level="1">
|
||||||
<ComponentGroupRef Id="Files" />
|
<ComponentGroupRef Id="Files" />
|
||||||
</Feature>
|
</Feature>
|
||||||
|
|
||||||
<Directory Id="$(var.PlatformProgramFiles)">
|
<Directory Id="$(var.PlatformProgramFiles)">
|
||||||
<Directory Id="APPLICATIONROOTDIRECTORY" Name="windows_exporter">
|
<Directory Id="APPLICATIONROOTDIRECTORY" Name="windows_exporter">
|
||||||
<Directory Id="textfile_inputs" Name="textfile_inputs" />
|
<Directory Id="textfile_inputs" Name="textfile_inputs" />
|
||||||
</Directory>
|
|
||||||
</Directory>
|
</Directory>
|
||||||
</Package>
|
</Directory>
|
||||||
|
</Package>
|
||||||
</Wix>
|
</Wix>
|
||||||
|
|
Loading…
Reference in New Issue