From 7aa4199e4dae1f8acfbe6df37daacf5bbbcb9198 Mon Sep 17 00:00:00 2001 From: stdweird Date: Thu, 11 Jun 2020 10:31:38 +0200 Subject: [PATCH] ncm-metaconfig: ssh: register sshd test from stdin command --- .../src/main/metaconfig/ssh/pan/server_config.pan | 8 ++++++-- .../main/metaconfig/ssh/tests/profiles/server_config.pan | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ncm-metaconfig/src/main/metaconfig/ssh/pan/server_config.pan b/ncm-metaconfig/src/main/metaconfig/ssh/pan/server_config.pan index 4283933c31..609366d2d0 100644 --- a/ncm-metaconfig/src/main/metaconfig/ssh/pan/server_config.pan +++ b/ncm-metaconfig/src/main/metaconfig/ssh/pan/server_config.pan @@ -4,7 +4,11 @@ include 'metaconfig/ssh/schema'; bind "/software/components/metaconfig/services/{/etc/ssh/sshd_config}/contents" = sshd_config_file; -prefix "/software/components/metaconfig/services/{/etc/ssh/sshd_config}"; +prefix "/software/components/metaconfig"; + +final "commands/sshd_test_stdin" = "/usr/sbin/sshd -t -f /dev/stdin"; + +prefix "services/{/etc/ssh/sshd_config}"; "module" = "ssh/server"; -"commands/test" = "/usr/sbin/sshd -t -f /dev/stdin"; +"actions/test" = "sshd_test_stdin"; "daemons/sshd" = "restart"; diff --git a/ncm-metaconfig/src/main/metaconfig/ssh/tests/profiles/server_config.pan b/ncm-metaconfig/src/main/metaconfig/ssh/tests/profiles/server_config.pan index 59e94d3b52..31082acf6f 100644 --- a/ncm-metaconfig/src/main/metaconfig/ssh/tests/profiles/server_config.pan +++ b/ncm-metaconfig/src/main/metaconfig/ssh/tests/profiles/server_config.pan @@ -1,5 +1,11 @@ object template server_config; +# add this to test the actions/commands to trigger the main metaconfig bind +function pkg_repl = { null; }; +include 'components/metaconfig/config'; +# remove the dependencies +'/software/components/metaconfig/dependencies' = null; + include 'metaconfig/ssh/server_config'; prefix "/software/components/metaconfig/services/{/etc/ssh/sshd_config}/contents";