You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2016/08/15 13:16:02 UTC
[1/2] brooklyn-library git commit: Fix NPE generating Nginx config
when no SSL configured
Repository: brooklyn-library
Updated Branches:
refs/heads/master 69efaf576 -> 138f6b32e
Fix NPE generating Nginx config when no SSL configured
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/03fede0d
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/03fede0d
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/03fede0d
Branch: refs/heads/master
Commit: 03fede0de3699a0a663d244c21ab1e3288573133
Parents: 69efaf5
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Mon Aug 15 12:18:32 2016 +0100
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Mon Aug 15 12:18:32 2016 +0100
----------------------------------------------------------------------
.../brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/03fede0d/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java
index bbe81aa..341bf67 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java
@@ -78,7 +78,9 @@ public class NginxDefaultConfigGenerator implements NginxConfigFileGenerator {
config.append(" }\n");
config.append(" server {\n");
config.append(getCodeForServerConfig());
- appendCodeForProxySSLConfig(nginx.getId(), config, " ", globalSslConfig);
+ if (globalSslConfig != null) {
+ appendCodeForProxySSLConfig(nginx.getId(), config, " ", globalSslConfig);
+ }
config.append(" listen "+nginx.getPort()+";\n");
if (nginx.getDomain()!=null)
config.append(" server_name "+nginx.getDomain()+";\n");
[2/2] brooklyn-library git commit: This closes #59
Posted by gr...@apache.org.
This closes #59
* github/pr/59:
Fix NPE generating Nginx config when no SSL configured
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/138f6b32
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/138f6b32
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/138f6b32
Branch: refs/heads/master
Commit: 138f6b32ebfe8a9d6da4b1324b4f3a481c0756aa
Parents: 69efaf5 03fede0
Author: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Authored: Mon Aug 15 14:15:56 2016 +0100
Committer: Andrew Donald Kennedy <an...@cloudsoftcorp.com>
Committed: Mon Aug 15 14:15:56 2016 +0100
----------------------------------------------------------------------
.../brooklyn/entity/proxy/nginx/NginxDefaultConfigGenerator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------