Skip to content

Commit 30d246a

Browse files
committed
Made requested changes from the pull request
1 parent 3f636a8 commit 30d246a

File tree

7 files changed

+18
-55
lines changed

7 files changed

+18
-55
lines changed
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
This project shows how to configure an external security and use it in an app sever.
2-
3-
If you want to deploy using a user with external security you'll need to configure the 8000, 8001 and 8002 server added of time.
1+
This project shows how to configure an external security and use it in an application server.
42

3+
If you want to deploy using a user with external security you'll need to configure the Admin, App-Services and Manage servers ahead of time.
Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
11
plugins {
2-
// The properties plugin must be applied BEFORE ml-gradle so that ml-gradle sees the results of the properties plugin
3-
// processing the gradle-(environmentName).properties files.
4-
id "net.saliman.properties" version "1.4.6"
5-
62
id "com.marklogic.ml-gradle" version "3.6.0"
7-
}
8-
9-
task printHost {
10-
doLast {
11-
println "mlHost: ${mlHost}"
12-
}
13-
}
3+
}

examples/external-security/gradle-dev.properties

Lines changed: 0 additions & 8 deletions
This file was deleted.

examples/external-security/gradle-prod.properties

Lines changed: 0 additions & 8 deletions
This file was deleted.

examples/external-security/gradle-qa.properties

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
mlHost=localhost
2-
mlAppName=properties-example
3-
mlRestPort=8071
2+
mlAppName=external-security-example
3+
mlRestPort=8141
44
mlUsername=admin
55
mlPassword=admin
66

7-
#intentionally left empty.
8-
#empty means there is no External Security Configuration
9-
cpExternalSecurity=
7+
#leave blank if you do not want an External Security Configuration used for an application server
8+
cpExternalSecurity=example
9+
10+
#the below is needed if you want to deploy with an external user
11+
#basic is used in this example but kerberos-ticket could also be used
12+
mlRestAuthentication=basic
13+
mlAppServicesAuthentication=basic
14+
mlAdminAuthentication=basic
15+
mlManageAuthentication=basic
16+
17+
Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,6 @@
11
{
22
"server-type": "http",
3-
"root": "/",
4-
"group-name": "%%GROUP%%",
5-
"port": "5432",
6-
"server-name": "example-servers",
7-
"modules-database": "%%mlModulesDbName%%",
8-
"content-database": "documents",
3+
"server-name": "%%NAME%%",
94
"authentication": "basic",
10-
"default-error-format": "json",
11-
"error-handler": "/MarkLogic/rest-api/error-handler.xqy",
12-
"url-rewriter": "/MarkLogic/rest-api/rewriter.xml",
13-
"rewrite-resolves-globally": true,
14-
15-
"external-security":["%%cpExternalSecurity%%"]
5+
"external-security":["%%cpExternalSecurity%%"]
166
}

0 commit comments

Comments
 (0)