File tree Expand file tree Collapse file tree
src/main/kotlin/com/cognifide/gradle/aem Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -70,14 +70,21 @@ class AemConfig(
7070 * will be performed (only if distributed deploy is enabled).
7171 */
7272 @Input
73- var deployInstanceAuthorName: String = propParser.string(" aem.deploy.instance.author.name" , " $deployEnvironment -${InstanceType .AUTHOR .type} " )
73+ var deployInstanceAuthorName: String = propParser.string(" aem.deploy.instance.author.name" , " $deployEnvironment -${InstanceType .AUTHOR } * " )
7474
7575 /* *
7676 * Defines maximum time after which initializing connection to AEM will be aborted (e.g on upload, install).
7777 */
7878 @Input
7979 var deployConnectionTimeout: Int = propParser.int(" aem.deploy.connectionTimeout" , 5000 )
8080
81+ /* *
82+ * Determines if connection to untrusted (e.g. self-signed) SSL certificates should be allowed.
83+ * By default allows all SSL connections.
84+ */
85+ @Input
86+ var deployConnectionUntrustedSsl: Boolean = propParser.boolean(" aem.deploy.connectionUntrustedSsl" , true )
87+
8188 /* *
8289 * Perform deploy action (upload, install or activate) in parallel to multiple instances at once.
8390 */
@@ -97,13 +104,6 @@ class AemConfig(
97104 @Input
98105 var deployDistributed: Boolean = propParser.boolean(" aem.deploy.distributed" , false )
99106
100- /* *
101- * Determines if connection to untrusted (e.g. self-signed) SSL certificates should be allowed.
102- * By default allows all ssl connections.
103- */
104- @Input
105- var deployTrustingAllSSLCertificates: Boolean = propParser.boolean(" aem.deploy.trustingAllSSLCertificates" , true )
106-
107107 /* *
108108 * Force upload CRX package regardless if it was previously uploaded.
109109 */
Original file line number Diff line number Diff line change @@ -125,7 +125,7 @@ class InstanceSync(val project: Project, val instance: Instance) {
125125 .setDefaultCredentialsProvider(BasicCredentialsProvider ().apply {
126126 setCredentials(AuthScope .ANY , UsernamePasswordCredentials (instance.user, instance.password))
127127 })
128- if (config.deployTrustingAllSSLCertificates ) {
128+ if (config.deployConnectionUntrustedSsl ) {
129129 httpClientBuilder.setSSLSocketFactory(createSslConnectionSocketFactory())
130130 }
131131
You can’t perform that action at this time.
0 commit comments