Skip to content

Commit

Permalink
[windows] Remove reference to trace-agent.conf.example file (#1294)
Browse files Browse the repository at this point in the history
We don't ship it anymore on Windows, and  this ref makes the build
break.
  • Loading branch information
olivielpeau committed Feb 19, 2018
1 parent 5182200 commit 7a59060
Showing 1 changed file with 8 additions and 17 deletions.
25 changes: 8 additions & 17 deletions omnibus/resources/agent/msi/source.wxs.erb
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
<util:ServiceConfig
FirstFailureActionType='restart'
SecondFailureActionType='restart'
ThirdFailureActionType='restart'
ThirdFailureActionType='restart'
RestartServiceDelayInSeconds='30'
ResetPeriodInDays='1'/>
<ServiceDependency Id="winmgmt" />
Expand Down Expand Up @@ -195,7 +195,7 @@
<util:ServiceConfig
FirstFailureActionType='restart'
SecondFailureActionType='restart'
ThirdFailureActionType='restart'
ThirdFailureActionType='restart'
RestartServiceDelayInSeconds='30'
ResetPeriodInDays='1'/>
<ServiceDependency Id="datadogagent" />
Expand Down Expand Up @@ -234,7 +234,7 @@
<util:ServiceConfig
FirstFailureActionType='restart'
SecondFailureActionType='restart'
ThirdFailureActionType='restart'
ThirdFailureActionType='restart'
RestartServiceDelayInSeconds='30'
ResetPeriodInDays='1'/>
<ServiceDependency Id="datadogagent" />
Expand Down Expand Up @@ -286,14 +286,6 @@
Name="datadog.yaml"
Source="$(var.EtcFiles)\datadog.yaml.example"/>
</Component>
<Component Id="trace_agent.conf.example"
Guid="CE6515EE-3103-417E-8810-0B465545EB0B"
NeverOverwrite="yes"
Permanent="yes">
<File Id="trace_agent.conf.example"
Name="trace-agent.conf"
Source="$(var.EtcFiles)\trace-agent.conf.example"/>
</Component>

<Directory Id="checks.d" Name="checks.d">
<Component Id="checks.d"
Expand Down Expand Up @@ -333,7 +325,6 @@
<ComponentRef Id="conffolder" />
<ComponentGroupRef Id="ProjectDir" />
<ComponentRef Id="datadog.yaml.example" />
<ComponentRef Id="trace_agent.conf.example" />
<ComponentRef Id="logs" />
<ComponentRef Id="conf.d" />
<ComponentRef Id="checks.d" />
Expand Down Expand Up @@ -363,7 +354,7 @@

<TextStyle Id="TahomaHeader" FaceName="Tahoma" Size="18" Bold="yes" />
<TextStyle Id="TahomaNormal" FaceName="Tahoma" Size="8" />

<TextStyle Id="DlgFont8" FaceName="Tahoma" Size="8" />
<TextStyle Id="DlgFontBold8" FaceName="Tahoma" Size="8" Bold="yes" />
<TextStyle Id="Verdana13Bold" FaceName="Verdana" Size="13" Bold="yes" />
Expand Down Expand Up @@ -397,9 +388,9 @@
<DialogRef Id="ResumeDlg"/>



<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="LicenseAgreementDlg">NOT Installed</Publish>

<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="ApiKeyDlg">NOT PREVIOUSFOUND</Publish>
<Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg">PREVIOUSFOUND</Publish>

Expand Down Expand Up @@ -429,11 +420,11 @@
<Show Dialog="FatalError" OnExit="error" />
<Show Dialog="UserExit" OnExit="cancel" />
<Show Dialog="ExitDialog" OnExit="success" />

<Show Dialog="WelcomeDlg" After="MigrateFeatureStates"><![CDATA[NOT Installed]]></Show>
<Show Dialog="MaintenanceWelcomeDlg" Before="ProgressDlg" >Installed AND NOT RESUME AND NOT Preselected AND NOT PATCH</Show>

<!--
<!--
<Show Dialog="ResumeDlg" After="WelcomeDlg"><![CDATA[Installed AND (RESUME OR Preselected)]]></Show>
-->
<!--
Expand Down

0 comments on commit 7a59060

Please sign in to comment.