ncm-metaconfig: ssh: register sshd test from stdin command

quattor · Jun 11, 2020 · 7aa4199 · 7aa4199
1 parent a85a3ef
commit 7aa4199
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 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
@@ -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
@@ -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";