You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:46:29 UTC

[26/50] brooklyn-library git commit: Nginx ssl config: removed to strict validation where both key-destination/key-url need to be set..key isn't mandatory for nginx ssl configuration

Nginx ssl config: removed to strict validation where both key-destination/key-url need to be set..key isn't mandatory for nginx ssl configuration


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/4eff3225
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/4eff3225
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/4eff3225

Branch: refs/heads/0.4.0
Commit: 4eff32259e3660d56c8f23e307f39ec43ede0501
Parents: 2ff614f
Author: Peter Veentjer <pe...@cloudsoft.com>
Authored: Mon Oct 8 16:31:18 2012 +0300
Committer: Peter Veentjer <pe...@cloudsoft.com>
Committed: Mon Oct 8 16:31:18 2012 +0300

----------------------------------------------------------------------
 .../main/java/brooklyn/entity/proxy/nginx/NginxController.groovy | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/4eff3225/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.groovy b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.groovy
index 63c0319..031ab70 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.groovy
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxController.groovy
@@ -347,10 +347,6 @@ public class NginxController extends AbstractController {
     }
 
     void verifyConfig(ProxySslConfig proxySslConfig) {
-        if (proxySslConfig.keyDestination == null &&  proxySslConfig.sourceKeyUrl == null){
-            throw new IllegalStateException("ProxySslConfig can't have a null keyDestination and null sourceKeyUrl. One or both need to be set")
-        }
-
         if(proxySslConfig.certificateDestination == null && proxySslConfig.sourceCertificateUrl == null){
             throw new IllegalStateException("ProxySslConfig can't have a null certificateDestination and null sourceCertificateUrl. One or both need to be set")
         }