ncm-metaconfig: ssh: replace final with bind magic to fix sshd_test_s…

…tdin
quattor · Nov 3, 2020 · 8600f2a · 8600f2a
1 parent b1d707a
commit 8600f2a
Showing 1 changed file with 5 additions and 4 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,11 +4,12 @@ include 'metaconfig/ssh/schema';
 
 bind "/software/components/metaconfig/services/{/etc/ssh/sshd_config}/contents" = sshd_config_file;
 
-prefix "/software/components/metaconfig";
+# since final locks the whole path, bind it to a fix value and set it as default too
+# TODO: support in compiler
+bind "/software/components/metaconfig/commands/sshd_test_stdin" =
+ string = "/usr/sbin/sshd -t -f /dev/stdin" with SELF == "/usr/sbin/sshd -t -f /dev/stdin";
 
-final "commands/sshd_test_stdin" = "/usr/sbin/sshd -t -f /dev/stdin";
-
-prefix "services/{/etc/ssh/sshd_config}";
+prefix "/software/components/metaconfig/services/{/etc/ssh/sshd_config}";
 "module" = "ssh/server";
 "actions/test" = "sshd_test_stdin";
 "daemons/sshd" = "restart";