fix variables linux

This commit is contained in:
Erik Pique 2019-01-31 15:02:55 +01:00
parent afa273b723
commit 416ca43cea
13 changed files with 19 additions and 25 deletions
ServiceFabric/Linux
Infrastructure
eShopOnServiceFabricBus/Bus/PublishProfiles
eShopOnServiceFabricNoSql/NoSQL/PublishProfiles
eShopOnServiceFabric/PublishProfiles
eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/PublishProfiles
eShopOnServiceFabricBFF/PublishProfiles
eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles
eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC
ApplicationPackageRoot/WebMVCPkg
PublishProfiles
eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA
ApplicationPackageRoot
PublishProfiles
eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus
ApplicationPackageRoot/WebStatusPkg
PublishProfiles

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

@ -20,7 +20,7 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
<CopyPackageParameters CompressPackage="true" /> <CopyPackageParameters CompressPackage="true" />
</PublishProfile> </PublishProfile>

@ -6,6 +6,6 @@
For a local cluster, you would typically not use any parameters. For a local cluster, you would typically not use any parameters.
For example: <ClusterConnectionParameters /> For example: <ClusterConnectionParameters />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="eshopsflin.westeurope.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="31CF80FDFB8F64D379E3DCF9185032581B8FC080" FindType="FindByThumbprint" FindValue="31CF80FDFB8F64D379E3DCF9185032581B8FC080" StoreLocation="CurrentUser" StoreName="My" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

@ -30,7 +30,7 @@
<EnvironmentVariable Name="PurchaseUrlHC" Value="http://webshoppingapigw/hc"/> <EnvironmentVariable Name="PurchaseUrlHC" Value="http://webshoppingapigw/hc"/>
<EnvironmentVariable Name="MarketingUrlHC" Value="http://webmarketingapigw/hc "/> <EnvironmentVariable Name="MarketingUrlHC" Value="http://webmarketingapigw/hc "/>
<EnvironmentVariable Name="UseCustomizationData" Value="True"/> <EnvironmentVariable Name="UseCustomizationData" Value="True"/>
<EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/> <EnvironmentVariable Name="ApplicationInsights__InstrumentationKey" Value=""/>
<EnvironmentVariable Name="OrchestratorType" Value="SF"/> <EnvironmentVariable Name="OrchestratorType" Value="SF"/>
<EnvironmentVariable Name="UseLoadTest" Value="False"/> <EnvironmentVariable Name="UseLoadTest" Value="False"/>
</EnvironmentVariables> </EnvironmentVariables>

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

@ -6,17 +6,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<Parameters> <Parameters>
<Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" /> <Parameter Name="WebSPA_InstanceCount" DefaultValue="-1" />
<Parameter Name="MarketingUrl" DefaultValue="" />
<Parameter Name="IdentityUrl" DefaultValue="" /> <Parameter Name="IdentityUrl" DefaultValue="" />
<Parameter Name="InstrumentationKey" DefaultValue="" /> <Parameter Name="InstrumentationKey" DefaultValue="" />
<Parameter Name="CatalogUrl" DefaultValue="" /> <Parameter Name="CatalogUrl" DefaultValue="" />
<Parameter Name="OrderingUrl" DefaultValue="" /> <Parameter Name="OrderingUrl" DefaultValue="" />
<Parameter Name="BasketUrl" DefaultValue="" /> <Parameter Name="BasketUrl" DefaultValue="" />
<Parameter Name="MarketingUrl" DefaultValue="" />
<Parameter Name="IdentityUrl" DefaultValue="" />
<Parameter Name="OrderingBackgroundUrl" DefaultValue=""/>
<Parameter Name="OrderingSignalrHubUrl" DefaultValue=""/>
<Parameter Name="PaymentUrl" DefaultValue=""/>
<Parameter Name="InstrumentationKey" DefaultValue="" />
</Parameters> </Parameters>
<!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion
should match the Name and Version attributes of the ServiceManifest element defined in the should match the Name and Version attributes of the ServiceManifest element defined in the
@ -25,16 +20,12 @@
<ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" /> <ServiceManifestRef ServiceManifestName="WebSPAPkg" ServiceManifestVersion="1.0.0" />
<!-- Override external urls depending on environment --> <!-- Override external urls depending on environment -->
<EnvironmentOverrides CodePackageRef="Code"> <EnvironmentOverrides CodePackageRef="Code">
<EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
<EnvironmentVariable Name="ApplicationInsights__InstrumentationKey" Value="[InstrumentationKey]"/>
<EnvironmentVariable Name="CatalogUrl" Value="[CatalogUrl]"/>
<EnvironmentVariable Name="PaymentUrl" Value="[PaymentUrl]"/>
<EnvironmentVariable Name="OrderingUrl" Value="[OrderingUrl]"/>
<EnvironmentVariable Name="BasketUrl" Value="[BasketUrl]"/>
<EnvironmentVariable Name="MarketingUrl" Value="[MarketingUrl]"/> <EnvironmentVariable Name="MarketingUrl" Value="[MarketingUrl]"/>
<EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/> <EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
<EnvironmentVariable Name="OrderingBackgroundUrl" Value="[OrderingBackgroundUrl]"/> <EnvironmentVariable Name="CatalogUrl" Value="[CatalogUrl]"/>
<EnvironmentVariable Name="OrderingSignalrHubUrl" Value="[OrderingSignalrHubUrl]"/> <EnvironmentVariable Name="OrderingUrl" Value="[OrderingUrl]"/>
<EnvironmentVariable Name="BasketUrl" Value="[BasketUrl]"/>
<EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value="[InstrumentationKey]"/>
</EnvironmentOverrides> </EnvironmentOverrides>
<Policies> <Policies>
<ContainerHostPolicies CodePackageRef="Code"> <ContainerHostPolicies CodePackageRef="Code">

@ -25,6 +25,9 @@
<EnvironmentVariable Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105"/> <EnvironmentVariable Name="IdentityUrl" Value="http://#{your_sf_dns}#:5105"/>
<EnvironmentVariable Name="PurchaseUrl" Value="http://#{your_sf_dns}#:5202"/> <EnvironmentVariable Name="PurchaseUrl" Value="http://#{your_sf_dns}#:5202"/>
<EnvironmentVariable Name="MarketingUrl" Value="http://#{your_sf_dns}#:5203"/> <EnvironmentVariable Name="MarketingUrl" Value="http://#{your_sf_dns}#:5203"/>
<EnvironmentVariable Name="CatalogUrl" Value="http://#{your_sf_dns}#:5101" />
<EnvironmentVariable Name="OrderingUrl" Value="http://#{your_sf_dns}#:5102" />
<EnvironmentVariable Name="BasketUrl" Value="http://#{your_sf_dns}#:5103" />
<EnvironmentVariable Name="PurchaseUrlHC" Value="http://webshoppingapigw/hc"/> <EnvironmentVariable Name="PurchaseUrlHC" Value="http://webshoppingapigw/hc"/>
<EnvironmentVariable Name="MarketingUrlHC" Value="http://webmarketingapigw/hc"/> <EnvironmentVariable Name="MarketingUrlHC" Value="http://webmarketingapigw/hc"/>
<EnvironmentVariable Name="IdentityUrlHC" Value="http://identity.api/hc"/> <EnvironmentVariable Name="IdentityUrlHC" Value="http://identity.api/hc"/>

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>

@ -57,7 +57,7 @@
<EnvironmentVariable Name="HealthChecks-UI__HealthChecks__17__Name" Value="Ordering SignalRHub HTTP Check"/> <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__17__Name" Value="Ordering SignalRHub HTTP Check"/>
<EnvironmentVariable Name="HealthChecks-UI__HealthChecks__17__Uri" Value="http://ordering.signalrhub/hc"/> <EnvironmentVariable Name="HealthChecks-UI__HealthChecks__17__Uri" Value="http://ordering.signalrhub/hc"/>
<EnvironmentVariable Name="OrderingBackgroundTasksUrl" Value="http://ordering.background/hc"/> <EnvironmentVariable Name="OrderingBackgroundTasksUrl" Value="http://ordering.background/hc"/>
<EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value=""/> <EnvironmentVariable Name="ApplicationInsights__InstrumentationKey" Value=""/>
<EnvironmentVariable Name="OrchestratorType" Value="SF"/> <EnvironmentVariable Name="OrchestratorType" Value="SF"/>
</EnvironmentVariables> </EnvironmentVariables>
</CodePackage> </CodePackage>

@ -20,6 +20,6 @@
AzureActiveDirectory="true" AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" /> ServerCertThumbprint="0123456789012345678901234567890123456789" />
--> -->
<ClusterConnectionParameters ConnectionEndpoint="#{your_sf_dns}#:19000" /> <ClusterConnectionParameters ConnectionEndpoint="eshop-sf-linux.southcentralus.cloudapp.azure.com:19000" X509Credential="true" ServerCertThumbprint="97375E52D92CAFE86BACF0ED4197537A8B45CD95" FindType="FindByThumbprint" FindValue="97375E52D92CAFE86BACF0ED4197537A8B45CD95" StoreLocation="CurrentUser" StoreName="My" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" /> <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
</PublishProfile> </PublishProfile>