You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2014/07/16 12:13:47 UTC
[1/2] git commit: put keys on server with permissions 0600 rather
than 0400 so we can rebind (rebind still always replaces them which is
slightly wasteful but we can live with that)
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master 896d4d0fa -> 6325e507c
put keys on server with permissions 0600 rather than 0400 so we can rebind (rebind still always replaces them which is slightly wasteful but we can live with that)
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/27d15d7e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/27d15d7e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/27d15d7e
Branch: refs/heads/master
Commit: 27d15d7e2d1c3b07e4aa806946672bd137c1c785
Parents: d6ef743
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Jul 15 15:06:31 2014 -0400
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Jul 15 15:06:31 2014 -0400
----------------------------------------------------------------------
.../java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/27d15d7e/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
index b11d951..f482422 100644
--- a/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
+++ b/software/webapp/src/main/java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java
@@ -227,14 +227,14 @@ public class NginxControllerImpl extends AbstractControllerImpl implements Nginx
if (!Strings.isEmpty(ssl.getCertificateSourceUrl())) {
String certificateDestination = Strings.isEmpty(ssl.getCertificateDestination()) ? driver.getRunDir() + "/conf/" + id + ".crt" : ssl.getCertificateDestination();
- driver.getMachine().copyTo(ImmutableMap.of("permissions", "0400"),
+ driver.getMachine().copyTo(ImmutableMap.of("permissions", "0600"),
ResourceUtils.create(this).getResourceFromUrl(ssl.getCertificateSourceUrl()),
certificateDestination);
}
if (!Strings.isEmpty(ssl.getKeySourceUrl())) {
String keyDestination = Strings.isEmpty(ssl.getKeyDestination()) ? driver.getRunDir() + "/conf/" + id + ".key" : ssl.getKeyDestination();
- driver.getMachine().copyTo(ImmutableMap.of("permissions", "0400"),
+ driver.getMachine().copyTo(ImmutableMap.of("permissions", "0600"),
ResourceUtils.create(this).getResourceFromUrl(ssl.getKeySourceUrl()),
keyDestination);
}
[2/2] git commit: This closes #70
Posted by an...@apache.org.
This closes #70
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/6325e507
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/6325e507
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/6325e507
Branch: refs/heads/master
Commit: 6325e507cade40b8843cfc1f39a8cab659087831
Parents: 896d4d0 27d15d7
Author: Andrea Turli <an...@gmail.com>
Authored: Wed Jul 16 12:13:33 2014 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Wed Jul 16 12:13:33 2014 +0200
----------------------------------------------------------------------
.../java/brooklyn/entity/proxy/nginx/NginxControllerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------