diff --git a/core/trino-server-rpm/README.md b/core/trino-server-rpm/README.md index 1572e760df29..fe0154ed4857 100644 --- a/core/trino-server-rpm/README.md +++ b/core/trino-server-rpm/README.md @@ -32,7 +32,7 @@ After installing Trino from the RPM, you can run: We use the following directory structure to deploy various Trino artifacts. * `/usr/lib/trino/lib/`: Various libraries needed to run the product. Plugins go in a `plugin` subdirectory. -* `/etc/trino`: General Trino configuration files like `node.properties`, `jvm.config`, `config.properties`. Connector configs go in a `catalog` subdirectory +* `/etc/trino`: General Trino configuration files like `node.properties`, `jvm.config`, `config.properties`, `secrets.toml`. Connector configs go in a `catalog` subdirectory * `/etc/trino/env.sh`: Java installation path used by Trino * `/var/log/trino`: Log files * `/var/lib/trino/data`: Data directory diff --git a/core/trino-server-rpm/src/main/resources/dist/config/secrets.toml b/core/trino-server-rpm/src/main/resources/dist/config/secrets.toml new file mode 100644 index 000000000000..23c689afddce --- /dev/null +++ b/core/trino-server-rpm/src/main/resources/dist/config/secrets.toml @@ -0,0 +1,2 @@ +[env] +secrets-provider.name="env" diff --git a/core/trino-server-rpm/src/main/resources/dist/etc/init.d/trino b/core/trino-server-rpm/src/main/resources/dist/etc/init.d/trino index 4b3a8536b86b..ea162d3bb989 100644 --- a/core/trino-server-rpm/src/main/resources/dist/etc/init.d/trino +++ b/core/trino-server-rpm/src/main/resources/dist/etc/init.d/trino @@ -33,6 +33,7 @@ CONFIGURATION=( --node-config "$NODE_PROPERTIES" --jvm-config /etc/trino/jvm.config --config /etc/trino/config.properties + --secrets-config /etc/trino/secrets.toml --launcher-log-file "${LAUNCHER_LOG_FILE:-/var/log/trino/launcher.log}" --server-log-file "${SERVER_LOG_FILE:-/var/log/trino/server.log}" ) diff --git a/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java b/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java index 2bc42eaf1f8a..edb90ae96004 100644 --- a/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java +++ b/core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java @@ -176,6 +176,7 @@ public void testRpmContents() assertThatPaths(files) .path("/usr/lib/trino/etc").linksTo("/etc/trino") .exists("/etc/trino/config.properties") + .exists("/etc/trino/secrets.toml") .exists("/etc/trino/jvm.config") .exists("/etc/trino/env.sh") .exists("/etc/trino/log.properties") @@ -190,6 +191,11 @@ public void testRpmContents() .paths("/usr/lib/trino/plugin/[a-z_]+\\.jar", path -> { String filename = Path.of(path.getPath()).getFileName().toString(); path.isLink().linksTo("../../shared/" + filename); + }) + // secrets-plugins libs are always hardlinks + .paths("/usr/lib/trino/secrets-plugin/[a-z_]+\\.jar", path -> { + String filename = Path.of(path.getPath()).getFileName().toString(); + path.isLink().linksTo("../../shared/" + filename); }); } }