Skip to content

Commit 407c3e9

Browse files
romanmichalvasko
authored andcommitted
scripts UPDATE add ssh banner config
1 parent d7f08c5 commit 407c3e9

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ set(LIBYANG_DEP_SOVERSION 3.0.0)
4949
set(LIBYANG_DEP_SOVERSION_MAJOR 3)
5050

5151
# libnetconf2 required version
52-
set(LIBNETCONF2_DEP_VERSION 3.5.2)
53-
set(LIBNETCONF2_DEP_SOVERSION 4.4.2)
52+
set(LIBNETCONF2_DEP_VERSION 3.5.4)
53+
set(LIBNETCONF2_DEP_SOVERSION 4.4.4)
5454
set(LIBNETCONF2_DEP_SOVERSION_MAJOR 4)
5555

5656
# sysrepo required version
@@ -407,6 +407,7 @@ if(SYSREPO_SETUP)
407407
message(STATUS \"Merging default server listen configuration if there is none (merge_config.sh)...\")
408408
set(ENV{SYSREPOCTL_EXECUTABLE} \"${SYSREPOCTL_EXECUTABLE}\")
409409
set(ENV{SYSREPOCFG_EXECUTABLE} \"${SYSREPOCFG_EXECUTABLE}\")
410+
set(ENV{NP2_VERSION} \"${NP2SRV_VERSION}\")
410411
execute_process(COMMAND \"\$ENV{DESTDIR}${DATA_DIR}/scripts/merge_config.sh\"
411412
RESULT_VARIABLE CMD_RES
412413
OUTPUT_VARIABLE CMD_OUT

scripts/merge_config.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ if [ -n "$AUTH_CONFIG" ]; then
6262
</users>"
6363
fi
6464

65+
SSH_BANNER=""
66+
# check if the NP2_VERSION environment variable is set
67+
if [ -n "$NP2_VERSION" ]; then
68+
# get the banner from the NP2_VERSION environment variable
69+
SSH_BANNER="<banner xmlns=\"urn:cesnet:libnetconf2-netconf-server\">netopeer2-netconf-server-${NP2_VERSION}</banner>"
70+
fi
71+
6572
# import default config
6673
CONFIG="<netconf-server xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-server\">
6774
<listen>
@@ -74,6 +81,7 @@ CONFIG="<netconf-server xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-server\
7481
</tcp-server-parameters>
7582
<ssh-server-parameters>
7683
<server-identity>
84+
${SSH_BANNER}
7785
<host-key>
7886
<name>default-key</name>
7987
<public-key>

0 commit comments

Comments
 (0)