Browse Source

fix variables linux

pull/931/head
Erik Pique 6 years ago
parent
commit
416ca43cea
13 changed files with 17 additions and 23 deletions
  1. +1
    -1
      ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml
  2. +1
    -1
      ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml
  3. +1
    -1
      ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Cloud.xml
  4. +1
    -1
      ServiceFabric/Linux/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/PublishProfiles/Cloud.xml
  5. +1
    -1
      ServiceFabric/Linux/eShopOnServiceFabricBFF/PublishProfiles/Cloud.xml
  6. +1
    -1
      ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml
  7. +1
    -1
      ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml
  8. +1
    -1
      ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml
  9. +3
    -12
      ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml
  10. +3
    -0
      ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml
  11. +1
    -1
      ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml
  12. +1
    -1
      ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml
  13. +1
    -1
      ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml

+ 1
- 1
ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml View File

@ -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>

+ 1
- 1
ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml View File

@ -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>

+ 1
- 1
ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Cloud.xml View File

@ -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>

+ 1
- 1
ServiceFabric/Linux/eShopOnServiceFabricApiGateWays/eShopOnServiceFabricApiGW/PublishProfiles/Cloud.xml View File

@ -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>

+ 1
- 1
ServiceFabric/Linux/eShopOnServiceFabricBFF/PublishProfiles/Cloud.xml View File

@ -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>

+ 1
- 1
ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml View File

@ -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>

+ 1
- 1
ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml View File

@ -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>


+ 1
- 1
ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml View File

@ -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>

+ 3
- 12
ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml View File

@ -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="MarketingUrl" Value="[MarketingUrl]"/>
<EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/> <EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
<EnvironmentVariable Name="ApplicationInsights__InstrumentationKey" Value="[InstrumentationKey]"/>
<EnvironmentVariable Name="CatalogUrl" Value="[CatalogUrl]"/> <EnvironmentVariable Name="CatalogUrl" Value="[CatalogUrl]"/>
<EnvironmentVariable Name="PaymentUrl" Value="[PaymentUrl]"/>
<EnvironmentVariable Name="OrderingUrl" Value="[OrderingUrl]"/> <EnvironmentVariable Name="OrderingUrl" Value="[OrderingUrl]"/>
<EnvironmentVariable Name="BasketUrl" Value="[BasketUrl]"/> <EnvironmentVariable Name="BasketUrl" Value="[BasketUrl]"/>
<EnvironmentVariable Name="MarketingUrl" Value="[MarketingUrl]"/>
<EnvironmentVariable Name="IdentityUrl" Value="[IdentityUrl]"/>
<EnvironmentVariable Name="OrderingBackgroundUrl" Value="[OrderingBackgroundUrl]"/>
<EnvironmentVariable Name="OrderingSignalrHubUrl" Value="[OrderingSignalrHubUrl]"/>
<EnvironmentVariable Name="ApplicationInsights:InstrumentationKey" Value="[InstrumentationKey]"/>
</EnvironmentOverrides> </EnvironmentOverrides>
<Policies> <Policies>
<ContainerHostPolicies CodePackageRef="Code"> <ContainerHostPolicies CodePackageRef="Code">


+ 3
- 0
ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml View File

@ -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"/>


+ 1
- 1
ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml View File

@ -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>

+ 1
- 1
ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml View File

@ -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>


+ 1
- 1
ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml View File

@ -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>

Loading…
Cancel
Save