Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cwp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
cwp
cwp
Commits
b33a16a6
Commit
b33a16a6
authored
Jun 15, 2017
by
John Oppler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix ADFS docs to account for DR instances
parent
eafe71b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
docs/en/01_Working_with_projects/12_CWP_environment_variables.md
.../01_Working_with_projects/12_CWP_environment_variables.md
+1
-1
docs/en/02_Features/active_directory_single_sign_on.md
docs/en/02_Features/active_directory_single_sign_on.md
+2
-2
No files found.
docs/en/01_Working_with_projects/12_CWP_environment_variables.md
View file @
b33a16a6
...
...
@@ -24,7 +24,7 @@ The following additional constants and globals are also configured.
|Constant/Global|Description|Guaranteed value|
|-|-|-|
|CWP_ENVIRONMENT|CWP Environment|"prod", "uat", or "test"|
|CWP_ENVIRONMENT|CWP Environment|"prod", "uat",
"dr", "uatdr"
or "test"|
|CWP_INSTANCE_DR_TYPE|DR type this instance is configured for|"backup", "passive", or "active"|
|CWP_URANDOM_TOKEN_1|Random 24-character alphanumeric (A-Z, a-z, 0-9) token, free for your custom use|-|
|CWP_URANDOM_TOKEN_2|As above, 2nd token|-|
...
...
docs/en/02_Features/active_directory_single_sign_on.md
View file @
b33a16a6
...
...
@@ -102,14 +102,14 @@ with the following in `mysite/_config.php`
**Replace 'instancename' with the actual instance name so that the URL is correct.**
// Configure SAML certificates for the CWP UAT environment
if(defined('CWP_ENVIRONMENT') &&
CWP_ENVIRONMENT == 'uat'
) {
if(defined('CWP_ENVIRONMENT') &&
(CWP_ENVIRONMENT == 'uat' || CWP_ENVIRONMENT == 'uatdr')
) {
Config::inst()->update('SAMLConfiguration', 'SP', array(
'entityId' => 'https://instancename-uat.cwp.govt.nz/',
'privateKey' => '../../certs/saml.pem',
'x509cert' => '../../certs/saml.crt'
));
// Configure SAML certificates for the CWP Production environment
} elseif(defined('CWP_ENVIRONMENT') &&
CWP_ENVIRONMENT == 'prod'
) {
} elseif(defined('CWP_ENVIRONMENT') &&
(CWP_ENVIRONMENT == 'prod' || CWP_ENVIRONMENT == 'dr')
) {
Config::inst()->update('SAMLConfiguration', 'SP', array(
'entityId' => 'https://instancename.cwp.govt.nz/',
'privateKey' => '../../certs/saml.pem',
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment