diff options
| author | Valerij Fredriksen <valerijf@yahooinc.com> | 2021-11-03 20:35:26 +0100 |
|---|---|---|
| committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2021-11-04 09:51:31 +0100 |
| commit | 1c4e9e206d705509518fe802fd490007c76ee7ae (patch) | |
| tree | 8970fb0da29edb9f4527bab3afd1c7ad5ddfd006 /node-admin | |
| parent | f0d166f3b3ae0cfb755784798647d22e508387c5 (diff) | |
Remove redundant chowns, defaults to vespa
Diffstat (limited to 'node-admin')
2 files changed, 4 insertions, 7 deletions
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java index 452e4e38972..3de4be0d8b9 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java @@ -257,14 +257,13 @@ public class AthenzCredentialsMaintainer implements CredentialsMaintainer { PrivateKey privateKey, ContainerPath certificateFile, X509Certificate certificate) { - writeFile(privateKeyFile, vespaUser, KeyUtils.toPem(privateKey)); - writeFile(certificateFile, vespaUser, X509CertificateUtils.toPem(certificate)); + writeFile(privateKeyFile.withUser(vespaUser), KeyUtils.toPem(privateKey)); + writeFile(certificateFile.withUser(vespaUser), X509CertificateUtils.toPem(certificate)); } - private static void writeFile(ContainerPath path, UnixUser vespaUser, String utf8Content) { + private static void writeFile(ContainerPath path, String utf8Content) { new UnixPath(path.resolveSibling(path.getFileName() + ".tmp")) .writeUtf8File(utf8Content, "r--------") - .setOwnerId(vespaUser.uid()) .atomicMove(path); } diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java index 38722231f54..ab782d25717 100644 --- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java +++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/servicedump/VespaServiceDumperImpl.java @@ -100,9 +100,7 @@ public class VespaServiceDumperImpl implements VespaServiceDumper { unixPathDirectory.deleteRecursively(); } context.log(log, Level.INFO, "Creating '" + unixPathDirectory +"'."); - unixPathDirectory.createDirectory("rwxr-x---") - .setOwner(context.users().vespa().name()) - .setGroup(context.users().vespa().group()); + unixPathDirectory.createDirectory("rwxr-x---"); URI destination = serviceDumpDestination(nodeSpec, createDumpId(request)); ProducerContext producerCtx = new ProducerContext(context, directory, request); List<Artifact> producedArtifacts = new ArrayList<>(); |