diff options
author | Øyvind Grønnesby <oyving@verizonmedia.com> | 2019-08-14 14:46:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-14 14:46:50 +0200 |
commit | 73757bb8992ce337cb26640834f928577fe9125a (patch) | |
tree | 6341e9bf8d230a41e76781993e452648b1da8762 /configserver | |
parent | 0a4669d973810e02fd7a6be10b5a1ee03142d5b4 (diff) | |
parent | 6db214234310b8e2841d964c610cf5dcf01b747b (diff) |
Merge pull request #10238 from vespa-engine/ogronnesby/propagate-ca-in-config
Add the CA certificates to configuration and read it from app package
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java index 484124991d9..a99a2a2917d 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ZooKeeperClient.java @@ -202,6 +202,9 @@ public class ZooKeeperClient { writeDir(app.getFile(ApplicationPackage.MODELS_GENERATED_REPLICATED_DIR), getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH).append(ApplicationPackage.MODELS_GENERATED_REPLICATED_DIR), true); + writeDir(app.getFile(ApplicationPackage.SECURITY_DIR), + getZooKeeperAppPath(ConfigCurator.USERAPP_ZK_SUBPATH).append(ApplicationPackage.SECURITY_DIR), + true); } private void writeDir(ApplicationFile file, Path zooKeeperAppPath, boolean recurse) throws IOException { |