From e4208147909e52c15f99263bed920c9648d356ce Mon Sep 17 00:00:00 2001 From: Alen Pelin Date: Fri, 21 Feb 2020 17:59:07 +1100 Subject: [PATCH] Updating vars --- docs/01-Getting-Started.md | 8 ++++---- settings.ps1 | 4 ++-- .../PageContent/code/.vs/config/applicationhost.config | 2 +- .../App_Config/Environment/Project/Habitat.Dev.config | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/01-Getting-Started.md b/docs/01-Getting-Started.md index 218bf20366..56d638d96a 100644 --- a/docs/01-Getting-Started.md +++ b/docs/01-Getting-Started.md @@ -17,14 +17,14 @@ This project assumes the following settings: | Setting | Value | Change in 1 *see below* | | --- | --- | --- | -| Source location | C:\projects\Habitat\ | `Habitat.Dev.config` | +| Source location | C:\Habitat\ | `Habitat.Dev.config` | | Website location | C:\inetpub\wwwroot\habitat.dev.local\ | `gulp-config.js`, `settings.ps1`, `xconnect-XP0.json`, `sitecore-XP0.json` | | Website URL | [https://habitat.dev.local/](https://habitat.dev.local/) | `publishsettings.targets`, `settings.ps1`, `Habitat.Website.config` | | SQL Server | . | `settings.ps1` | | SQL Server Admin | sa | `settings.ps1` | | SQL Server Password | 12345 | `settings.ps1` | -| SOLR Location | C:\solr\solr-7.5.0 | `settings.ps1` | -| SOLR URL | [https://solr750:8750/solr](https://solr750:8750/solr) (*Note https*) | `settings.ps1` | +| SOLR Location | c:\etc\solr-7.5.0 | `settings.ps1` | +| SOLR URL | [https://localhost:8750/solr](https://localhost:8750/solr) (*Note https*) | `settings.ps1` | | SOLR Windows Service Name | Solr-7.5.0 | `settings.ps1` | 1 Files referred are: @@ -153,4 +153,4 @@ Habitat demonstrates utilizing the Federated Authentication features of Sitecore 1. Use IIS to add an SSL certificate and binding to your Habitat site (required by Facebook). 1. [Register a Facebook App](https://developers.facebook.com/docs/apps/register/) using a Facebook Developer Account. 1. Add the domain under which you are running Habitat to the *App Domains* setting of your Facebook App. By default this is `habitat.dev.local`. -1. Use the *App ID* and *App Secret* from your app settings to populate the `Sitecore.Feature.Accounts.Facebook.AppId` and `Sitecore.Feature.Accounts.Facebook.AppSecret` settings, by default found in `Feature\Accounts\code\App_Config\Include\Feature\Feature.Accounts.config`. \ No newline at end of file +1. Use the *App ID* and *App Secret* from your app settings to populate the `Sitecore.Feature.Accounts.Facebook.AppId` and `Sitecore.Feature.Accounts.Facebook.AppSecret` settings, by default found in `Feature\Accounts\code\App_Config\Include\Feature\Feature.Accounts.config`. diff --git a/settings.ps1 b/settings.ps1 index 805d8c97fd..19486172d8 100644 --- a/settings.ps1 +++ b/settings.ps1 @@ -50,6 +50,6 @@ $IdentityAllowedCorsOrigins = $SitecoreSiteUrl $IdentityServerSiteRoot = Join-Path $webroot -ChildPath $IdentityServerSiteName # Solr Parameters -$SolrUrl = "https://solr750:8750/solr" -$SolrRoot = "C:\\solr\\solr-7.5.0" +$SolrUrl = "https://localhost:8750/solr" +$SolrRoot = "c:\\etc\\solr-7.5.0" $SolrService = "Solr-7.5.0" diff --git a/src/Feature/PageContent/code/.vs/config/applicationhost.config b/src/Feature/PageContent/code/.vs/config/applicationhost.config index 2cdeddb34d..b854eac1df 100644 --- a/src/Feature/PageContent/code/.vs/config/applicationhost.config +++ b/src/Feature/PageContent/code/.vs/config/applicationhost.config @@ -163,7 +163,7 @@ - + diff --git a/src/Project/Habitat/code/App_Config/Environment/Project/Habitat.Dev.config b/src/Project/Habitat/code/App_Config/Environment/Project/Habitat.Dev.config index 6b7cc800ce..7c0ad4447e 100644 --- a/src/Project/Habitat/code/App_Config/Environment/Project/Habitat.Dev.config +++ b/src/Project/Habitat/code/App_Config/Environment/Project/Habitat.Dev.config @@ -2,7 +2,7 @@ - + master @@ -11,4 +11,4 @@ - \ No newline at end of file +