summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2018-05-13 14:18:32 +0200
committerChristian Poessinger <christian@poessinger.com>2018-05-13 14:18:32 +0200
commitb1741fa54f711cb60f16c7f909bed50cd45be38c (patch)
tree6b6464b2976466093dbc39068d8e89d061ef0175 /Makefile
parent53e0b1f060c3403ec29658a566d370d12cf7f22f (diff)
parent3249bc34e9897fbb6b7cfb83e655a5b7c9d9ddcf (diff)
downloadvyos-1x-b1741fa54f711cb60f16c7f909bed50cd45be38c.tar.gz
vyos-1x-b1741fa54f711cb60f16c7f909bed50cd45be38c.zip
Merge branch 'ssh-rewrite' into current
* ssh-rewrite: T631: small bugfix in config parsind for deny-users T631: improve help for access-control T631: refactor SSH script and switch to jinja2 T631: first full generated config file with XML and Python T631: use completionHelp for SSH rather then valueHelp T631: Rewrite SSH configuration as XML interface definition
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index ee89a5608..d194b44e4 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,9 @@ interface_definitions:
sed -i '/^type: txt/d' $(TMPL_DIR)/system/ntp/server/node.tag/noselect/node.def
sed -i '/^type: txt/d' $(TMPL_DIR)/system/ntp/server/node.tag/preempt/node.def
sed -i '/^type: txt/d' $(TMPL_DIR)/system/ntp/server/node.tag/prefer/node.def
+ sed -i '/^type: txt/d' $(TMPL_DIR)/service/ssh/allow-root/node.def
+ sed -i '/^type: txt/d' $(TMPL_DIR)/service/ssh/disable-host-validation/node.def
+ sed -i '/^type: txt/d' $(TMPL_DIR)/service/ssh/disable-password-authentication/node.def
.PHONY: all
all: interface_definitions