From 153466c38384d42de7d02be1ecb22f53650c6dc5 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Mon, 11 Sep 2023 15:29:21 -0600 Subject: [PATCH] Make /var directory tree owned by $CLICON_GROUP --- example/main/Makefile.in | 7 ++++-- test/test_api.sh | 4 +-- test/test_augment.sh | 4 +-- test/test_augment_default.sh | 4 +-- test/test_augment_state.sh | 4 +-- test/test_augment_trans.sh | 4 +-- test/test_autocli_editmode.sh | 4 +-- test/test_autocli_grouping.sh | 8 +++--- test/test_autocli_hide.sh | 4 +-- test/test_autocli_listkey_compress.sh | 4 +-- test/test_autocli_obsolete.sh | 4 +-- test/test_autocli_show.sh | 4 +-- test/test_autocli_spec.sh | 4 +-- test/test_autocli_strict_expand.sh | 4 +-- test/test_autocli_sub.sh | 4 +-- test/test_autocli_treeref.sh | 4 +-- test/test_c++.sh | 4 +-- test/test_choice.sh | 4 +-- test/test_choice_recursive.sh | 4 +-- test/test_cli.sh | 4 +-- test/test_cli_apipath.sh | 4 +-- test/test_cli_duplicates.sh | 4 +-- test/test_cli_expand.sh | 4 +-- test/test_cli_history.sh | 4 +-- test/test_cli_leafref.sh | 4 +-- test/test_cli_multikey.sh | 4 +-- test/test_cli_pipe.sh | 4 +-- test/test_cli_rest.sh | 4 +-- test/test_cli_submodes.sh | 4 +-- test/test_cli_translate.sh | 4 +-- test/test_cli_union.sh | 4 +-- test/test_cli_varonly.sh | 4 +-- test/test_client.sh | 4 +-- test/test_config_dir.sh | 16 ++++++------ test/test_config_dump.sh | 4 +-- test/test_confirmed_commit.sh | 2 +- test/test_copy_config.sh | 2 +- test/test_datastore_format.sh | 4 +-- test/test_datastore_repair.sh | 4 +-- test/test_db.sh | 4 +-- test/test_debug.sh | 2 +- test/test_default_choice.sh | 4 +-- test/test_feature.sh | 4 +-- test/test_feature_startup.sh | 4 +-- test/test_http_data.sh | 4 +-- test/test_identity.sh | 4 +-- test/test_insert.sh | 4 +-- test/test_leaf_default.sh | 4 +-- test/test_leafref.sh | 4 +-- test/test_leafref_augment.sh | 4 +-- test/test_leafref_state.sh | 4 +-- test/test_leafref_union.sh | 4 +-- test/test_leafref_uses_augment.sh | 4 +-- test/test_minmax.sh | 4 +-- test/test_nacm.sh | 4 +-- test/test_nacm_credentials.sh | 2 +- test/test_nacm_datanode.sh | 4 +-- test/test_nacm_datanode_paths.sh | 4 +-- test/test_nacm_datanode_read.sh | 4 +-- test/test_nacm_datanode_write.sh | 4 +-- test/test_nacm_default.sh | 4 +-- test/test_nacm_ext.sh | 4 +-- test/test_nacm_module_read.sh | 4 +-- test/test_nacm_module_write.sh | 4 +-- test/test_nacm_protocol.sh | 4 +-- test/test_nacm_recovery.sh | 4 +-- test/test_netconf.sh | 2 +- test/test_netconf_filter.sh | 4 +-- test/test_netconf_framing.sh | 2 +- test/test_netconf_hello.sh | 2 +- test/test_netconf_monitoring.sh | 4 +-- test/test_netconf_monitoring_location.sh | 4 +-- test/test_netconf_monitoring_multiple.sh | 4 +-- test/test_netconf_notifications.sh | 4 +-- test/test_netconf_ssh_callhome.sh | 2 +- test/test_netconf_whitespace.sh | 4 +-- test/test_openconfig.sh | 4 +-- test/test_openconfig_interfaces.sh | 4 +-- test/test_openconfig_network_instance.sh | 4 +-- test/test_order.sh | 4 +-- test/test_pagination_config.sh | 4 +-- test/test_pagination_draft.sh | 4 +-- test/test_pagination_state.sh | 4 +-- test/test_pattern.sh | 4 +-- test/test_perf_cli.sh | 4 +-- test/test_perf_mem.sh | 2 +- test/test_perf_netconf.sh | 4 +-- test/test_perf_restconf.sh | 4 +-- test/test_perf_restconf_ssl.sh | 4 +-- test/test_perf_startup.sh | 4 +-- test/test_perf_state.sh | 4 +-- test/test_perf_state_only.sh | 4 +-- test/test_privileges.sh | 2 +- test/test_refine.sh | 4 +-- test/test_restconf.sh | 4 +-- test/test_restconf_basic_auth.sh | 8 +++--- test/test_restconf_callhome.sh | 2 +- test/test_restconf_continue.sh | 2 +- test/test_restconf_err.sh | 2 +- test/test_restconf_http_upgrade.sh | 4 +-- test/test_restconf_internal.sh | 4 +-- test/test_restconf_internal_usecases.sh | 4 +-- test/test_restconf_jukebox.sh | 2 +- test/test_restconf_listkey.sh | 2 +- test/test_restconf_netns.sh | 8 +++--- test/test_restconf_nmap.sh | 4 +-- test/test_restconf_noalpn.sh | 2 +- test/test_restconf_notifications.sh | 4 +-- test/test_restconf_op.sh | 2 +- test/test_restconf_plain_patch.sh | 2 +- test/test_restconf_ssl_certs.sh | 4 +-- test/test_restconf_startup.sh | 4 +-- test/test_restconf_yang_patch_json.sh | 2 +- test/test_restconf_yang_patch_xml.sh | 2 +- test/test_rpc.sh | 4 +-- test/test_snmp_entity.sh | 2 +- test/test_snmp_get.sh | 2 +- test/test_snmp_ifmib.sh | 2 +- test/test_snmp_rowstatus.sh | 2 +- test/test_snmp_set.sh | 2 +- test/test_snmp_system.sh | 2 +- test/test_snmp_union.sh | 2 +- test/test_sock.sh | 2 +- test/test_startup.sh | 4 +-- test/test_submodule.sh | 4 +-- test/test_transaction.sh | 2 +- test/test_transaction_restart.sh | 2 +- test/test_type.sh | 4 +-- test/test_type_range.sh | 4 +-- test/test_union.sh | 4 +-- test/test_unique.sh | 4 +-- test/test_unique_descendant.sh | 4 +-- test/test_upgrade_auto.sh | 4 +-- test/test_upgrade_checkold.sh | 4 +-- test/test_upgrade_failsafe.sh | 4 +-- test/test_upgrade_interfaces.sh | 4 +-- test/test_upgrade_interfaces_rfc7895.sh | 4 +-- test/test_upgrade_module.sh | 4 +-- test/test_upgrade_quit.sh | 4 +-- test/test_upgrade_repair.sh | 4 +-- test/test_when_mandatory.sh | 4 +-- test/test_when_must.sh | 4 +-- test/test_with_default.sh | 2 +- test/test_xml_trees.sh | 4 +-- test/test_xpath_functions.sh | 4 +-- test/test_yang.sh | 4 +-- test/test_yang_action.sh | 4 +-- test/test_yang_anydata.sh | 4 +-- test/test_yang_bind.sh | 4 +-- test/test_yang_default.sh | 2 +- test/test_yang_deviation.sh | 4 +-- test/test_yang_extension.sh | 4 +-- test/test_yang_load.sh | 32 ++++++++++++------------ test/test_yang_models_ieee.sh | 4 +-- test/test_yang_models_ietf.sh | 4 +-- test/test_yang_namespace.sh | 4 +-- test/test_yang_schema_mount.sh | 4 +-- test/test_yang_wdcc.sh | 2 +- test/test_yang_when.sh | 4 +-- test/test_yang_with_defaults.sh | 2 +- 160 files changed, 315 insertions(+), 312 deletions(-) diff --git a/example/main/Makefile.in b/example/main/Makefile.in index 995a397a6..0e31935a9 100644 --- a/example/main/Makefile.in +++ b/example/main/Makefile.in @@ -52,6 +52,9 @@ localstatedir = @localstatedir@ libdir = @exec_prefix@/lib APPNAME = example +CLICON_USER = @CLICON_USER@ +CLICON_GROUP = @CLICON_GROUP@ + # Here is where example yang appears YANG_INSTALLDIR = @YANG_INSTALLDIR@ # Install here if you want default clixon location: @@ -187,8 +190,8 @@ ifdef with_restconf endif install -d -m 0755 $(DESTDIR)$(libdir)/$(APPNAME)/clispec install -m 0644 $(CLISPECS) $(DESTDIR)$(libdir)/$(APPNAME)/clispec - install -d -m 0755 $(DESTDIR)$(localstatedir)/$(APPNAME) # This is for XMLDB_DIR - install -d -m 0755 $(DESTDIR)$(localstatedir)/run # This is for PID and SOCK + install -d -m 0775 -g $(CLICON_GROUP) $(DESTDIR)$(localstatedir)/$(APPNAME) # This is for XMLDB_DIR + install -d -m 0775 -g $(CLICON_GROUP) $(DESTDIR)$(localstatedir)/run # This is for PID and SOCK uninstall: rm -rf $(DESTDIR)$(sysconfdir)/$(APPNAME).xml diff --git a/test/test_api.sh b/test/test_api.sh index 0b08dba6c..56f9dffef 100755 --- a/test/test_api.sh +++ b/test/test_api.sh @@ -36,9 +36,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock $pdir - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir $format $RESTCONFIG diff --git a/test/test_augment.sh b/test/test_augment.sh index 4e4e7bca2..52630bda8 100755 --- a/test/test_augment.sh +++ b/test/test_augment.sh @@ -37,8 +37,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME true $RESTCONFIG diff --git a/test/test_augment_default.sh b/test/test_augment_default.sh index 08896c32b..0b8b30aca 100755 --- a/test/test_augment_default.sh +++ b/test/test_augment_default.sh @@ -21,8 +21,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir true diff --git a/test/test_augment_state.sh b/test/test_augment_state.sh index 142ca9f30..0f55503c3 100755 --- a/test/test_augment_state.sh +++ b/test/test_augment_state.sh @@ -22,8 +22,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/lib/$APPNAME/backend /usr/local/var/$APPNAME false diff --git a/test/test_augment_trans.sh b/test/test_augment_trans.sh index 3ec18e619..55bba6ff3 100755 --- a/test/test_augment_trans.sh +++ b/test/test_augment_trans.sh @@ -25,8 +25,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/lib/$APPNAME/backend /usr/local/var/$APPNAME false diff --git a/test/test_autocli_editmode.sh b/test/test_autocli_editmode.sh index 6967135a8..9c0cc527a 100755 --- a/test/test_autocli_editmode.sh +++ b/test/test_autocli_editmode.sh @@ -30,8 +30,8 @@ cat < $cfg $APPNAME /usr/local/lib/$APPNAME/cli $dir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false ${AUTOCLI} diff --git a/test/test_autocli_grouping.sh b/test/test_autocli_grouping.sh index 311ca6177..7b834d085 100755 --- a/test/test_autocli_grouping.sh +++ b/test/test_autocli_grouping.sh @@ -28,8 +28,8 @@ cat < $cfg $dir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false @@ -173,8 +173,8 @@ function testrun() $dir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false diff --git a/test/test_autocli_hide.sh b/test/test_autocli_hide.sh index 1a2052b40..dbb9a874e 100755 --- a/test/test_autocli_hide.sh +++ b/test/test_autocli_hide.sh @@ -37,8 +37,8 @@ cat < $cfg $clidir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false ${AUTOCLI} diff --git a/test/test_autocli_listkey_compress.sh b/test/test_autocli_listkey_compress.sh index 892882e88..2bc741e03 100755 --- a/test/test_autocli_listkey_compress.sh +++ b/test/test_autocli_listkey_compress.sh @@ -211,8 +211,8 @@ cat < $cfg $clidir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME false diff --git a/test/test_autocli_obsolete.sh b/test/test_autocli_obsolete.sh index 9111793fb..8c249e976 100755 --- a/test/test_autocli_obsolete.sh +++ b/test/test_autocli_obsolete.sh @@ -145,8 +145,8 @@ cat < $cfg $APPNAME /usr/local/lib/$APPNAME/cli $dir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false ${AUTOCLI} diff --git a/test/test_autocli_show.sh b/test/test_autocli_show.sh index 4f66f3059..bef861bd5 100755 --- a/test/test_autocli_show.sh +++ b/test/test_autocli_show.sh @@ -37,8 +37,8 @@ cat < $cfg $APPNAME /usr/local/lib/$APPNAME/cli $clidir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_autocli_spec.sh b/test/test_autocli_spec.sh index 2e0591ab4..0a596d43b 100755 --- a/test/test_autocli_spec.sh +++ b/test/test_autocli_spec.sh @@ -129,8 +129,8 @@ cat < $cfg $APPNAME /usr/local/lib/$APPNAME/cli $dir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false ${AUTOCLI} diff --git a/test/test_autocli_strict_expand.sh b/test/test_autocli_strict_expand.sh index 8307c2805..220311bab 100755 --- a/test/test_autocli_strict_expand.sh +++ b/test/test_autocli_strict_expand.sh @@ -33,8 +33,8 @@ cat < $cfg $clidir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false ${AUTOCLI} diff --git a/test/test_autocli_sub.sh b/test/test_autocli_sub.sh index 6fb62d31d..aa3800265 100755 --- a/test/test_autocli_sub.sh +++ b/test/test_autocli_sub.sh @@ -33,8 +33,8 @@ cat < $cfg $clidir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false ${AUTOCLI} diff --git a/test/test_autocli_treeref.sh b/test/test_autocli_treeref.sh index 675e6082c..ddb3aa86e 100755 --- a/test/test_autocli_treeref.sh +++ b/test/test_autocli_treeref.sh @@ -33,8 +33,8 @@ cat < $cfg $clidir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME false ${AUTOCLI} diff --git a/test/test_c++.sh b/test/test_c++.sh index 00c9af7e1..72d670207 100755 --- a/test/test_c++.sh +++ b/test/test_c++.sh @@ -24,8 +24,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_choice.sh b/test/test_choice.sh index 153965630..7ae6dd083 100755 --- a/test/test_choice.sh +++ b/test/test_choice.sh @@ -32,8 +32,8 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $clidir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME $RESTCONFIG diff --git a/test/test_choice_recursive.sh b/test/test_choice_recursive.sh index 9fd25133a..59c024c31 100755 --- a/test/test_choice_recursive.sh +++ b/test/test_choice_recursive.sh @@ -25,8 +25,8 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $clidir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_cli.sh b/test/test_cli.sh index f1e80cc3d..2a2a336c3 100755 --- a/test/test_cli.sh +++ b/test/test_cli.sh @@ -33,8 +33,8 @@ cat < $cfg $APPNAME /usr/local/lib/$APPNAME/cli $clidir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_cli_apipath.sh b/test/test_cli_apipath.sh index f05641474..e7dc318e6 100755 --- a/test/test_cli_apipath.sh +++ b/test/test_cli_apipath.sh @@ -30,8 +30,8 @@ cat < $cfg $clidir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME ${AUTOCLI} diff --git a/test/test_cli_duplicates.sh b/test/test_cli_duplicates.sh index 23cceb4a3..03e369d33 100755 --- a/test/test_cli_duplicates.sh +++ b/test/test_cli_duplicates.sh @@ -74,8 +74,8 @@ cat < $cfg $APPNAME /usr/local/lib/$APPNAME/cli $dir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false ${AUTOCLI} diff --git a/test/test_cli_expand.sh b/test/test_cli_expand.sh index 7f5ef1eec..ffe0240ed 100755 --- a/test/test_cli_expand.sh +++ b/test/test_cli_expand.sh @@ -27,8 +27,8 @@ cat < $cfg $clidir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_cli_history.sh b/test/test_cli_history.sh index ac1a1ad15..c424d4399 100755 --- a/test/test_cli_history.sh +++ b/test/test_cli_history.sh @@ -25,8 +25,8 @@ cat < $cfg $APPNAME $histfile $histsize - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_cli_leafref.sh b/test/test_cli_leafref.sh index c791a20a0..f0f039162 100755 --- a/test/test_cli_leafref.sh +++ b/test/test_cli_leafref.sh @@ -28,8 +28,8 @@ cat < $cfg $APPNAME /usr/local/lib/$APPNAME/cli $clidir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_cli_multikey.sh b/test/test_cli_multikey.sh index bf5cb3074..f34a23836 100755 --- a/test/test_cli_multikey.sh +++ b/test/test_cli_multikey.sh @@ -24,8 +24,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME ${AUTOCLI} diff --git a/test/test_cli_pipe.sh b/test/test_cli_pipe.sh index 2f82c58b8..b4316f994 100755 --- a/test/test_cli_pipe.sh +++ b/test/test_cli_pipe.sh @@ -26,8 +26,8 @@ cat < $cfg $clidir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_cli_rest.sh b/test/test_cli_rest.sh index ea8266b38..4c8538e2a 100755 --- a/test/test_cli_rest.sh +++ b/test/test_cli_rest.sh @@ -26,8 +26,8 @@ cat < $cfg $clidir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_cli_submodes.sh b/test/test_cli_submodes.sh index 46164caca..0e3fe89d6 100755 --- a/test/test_cli_submodes.sh +++ b/test/test_cli_submodes.sh @@ -30,8 +30,8 @@ cat < $cfg /usr/local/lib/$APPNAME/backend $clidir /usr/local/lib/$APPNAME/cli - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_cli_translate.sh b/test/test_cli_translate.sh index a44abdda9..3e0818a85 100755 --- a/test/test_cli_translate.sh +++ b/test/test_cli_translate.sh @@ -25,8 +25,8 @@ cat < $cfg $dir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME ${AUTOCLI} diff --git a/test/test_cli_union.sh b/test/test_cli_union.sh index 5430a6632..f76c6147c 100755 --- a/test/test_cli_union.sh +++ b/test/test_cli_union.sh @@ -70,8 +70,8 @@ cat < $cfg $APPNAME /usr/local/lib/$APPNAME/cli $dir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false ${AUTOCLI} diff --git a/test/test_cli_varonly.sh b/test/test_cli_varonly.sh index 84a064d06..890c05faa 100755 --- a/test/test_cli_varonly.sh +++ b/test/test_cli_varonly.sh @@ -25,8 +25,8 @@ cat < $cfg /usr/local/lib/$APPNAME/cli 0 /usr/local/lib/$APPNAME/clispec - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_client.sh b/test/test_client.sh index 1069fb735..ea4cc7ca5 100755 --- a/test/test_client.sh +++ b/test/test_client.sh @@ -37,9 +37,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock $pdir - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir $format $RESTCONFIG diff --git a/test/test_config_dir.sh b/test/test_config_dir.sh index e3563d516..05cc96215 100755 --- a/test/test_config_dir.sh +++ b/test/test_config_dir.sh @@ -26,8 +26,8 @@ test -d $cdir || mkdir $cdir cat < $cfg - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME ${YANG_INSTALLDIR} $dir @@ -53,8 +53,8 @@ new "Start with wrong configdir" cat < $cfg $dir/dontexist - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME ${YANG_INSTALLDIR} /usr/local/lib/$APPNAME/clispec @@ -72,8 +72,8 @@ rm -f $cfile1 cat < $cfg $dir/notexist - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME ${YANG_INSTALLDIR} /usr/local/lib/$APPNAME/clispec @@ -90,8 +90,8 @@ new "Start with empty configdir" cat < $cfg $cdir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME ${YANG_INSTALLDIR} /usr/local/lib/$APPNAME/clispec diff --git a/test/test_config_dump.sh b/test/test_config_dump.sh index da98e5f5d..30292f123 100755 --- a/test/test_config_dump.sh +++ b/test/test_config_dump.sh @@ -24,8 +24,8 @@ cat < $cfg /usr/local/lib/$APPNAME/backend $dir /usr/local/lib/$APPNAME/cli - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir 0 orig diff --git a/test/test_confirmed_commit.sh b/test/test_confirmed_commit.sh index f0a4a7858..69f1d204c 100755 --- a/test/test_confirmed_commit.sh +++ b/test/test_confirmed_commit.sh @@ -35,7 +35,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME $USER drop_perm diff --git a/test/test_copy_config.sh b/test/test_copy_config.sh index 44cb6be79..491c5ce2a 100755 --- a/test/test_copy_config.sh +++ b/test/test_copy_config.sh @@ -48,7 +48,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir $RESTCONFIG diff --git a/test/test_datastore_format.sh b/test/test_datastore_format.sh index eae298197..330c736d8 100755 --- a/test/test_datastore_format.sh +++ b/test/test_datastore_format.sh @@ -36,8 +36,8 @@ cat < $cfg $APPNAME /usr/local/lib/$APPNAME/cli $clidir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_datastore_repair.sh b/test/test_datastore_repair.sh index 0e3e6278d..dfa2cf416 100755 --- a/test/test_datastore_repair.sh +++ b/test/test_datastore_repair.sh @@ -21,9 +21,9 @@ cat < $cfg ietf-netconf:startup ${YANG_INSTALLDIR} $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/example/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true false diff --git a/test/test_db.sh b/test/test_db.sh index 4bbf163e4..8bac3f279 100755 --- a/test/test_db.sh +++ b/test/test_db.sh @@ -27,8 +27,8 @@ cat < $cfg $APPNAME /usr/local/lib/$APPNAME/cli $dir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_debug.sh b/test/test_debug.sh index c1398b1e9..f7e24e929 100755 --- a/test/test_debug.sh +++ b/test/test_debug.sh @@ -21,7 +21,7 @@ cat < $cfg $cfg ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock $dir/restconf.pidfile /usr/local/var/$APPNAME $APPNAME diff --git a/test/test_default_choice.sh b/test/test_default_choice.sh index 2e64c679f..0eb9ec8d9 100755 --- a/test/test_default_choice.sh +++ b/test/test_default_choice.sh @@ -27,8 +27,8 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $clidir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_feature.sh b/test/test_feature.sh index 4090c73a5..58278ac9a 100755 --- a/test/test_feature.sh +++ b/test/test_feature.sh @@ -38,8 +38,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME true diff --git a/test/test_feature_startup.sh b/test/test_feature_startup.sh index f75cb5360..7cba882ac 100755 --- a/test/test_feature_startup.sh +++ b/test/test_feature_startup.sh @@ -21,8 +21,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_http_data.sh b/test/test_http_data.sh index 63229d645..74c16652d 100755 --- a/test/test_http_data.sh +++ b/test/test_http_data.sh @@ -155,8 +155,8 @@ function testrun() $wdir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME true $RESTCONFIG diff --git a/test/test_identity.sh b/test/test_identity.sh index 9ee499abf..32ce5a4ad 100755 --- a/test/test_identity.sh +++ b/test/test_identity.sh @@ -28,8 +28,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME $RESTCONFIG diff --git a/test/test_insert.sh b/test/test_insert.sh index b94ee380c..97b5a7d13 100755 --- a/test/test_insert.sh +++ b/test/test_insert.sh @@ -23,8 +23,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_leaf_default.sh b/test/test_leaf_default.sh index 1dd6ea55e..38dcbdf61 100755 --- a/test/test_leaf_default.sh +++ b/test/test_leaf_default.sh @@ -33,8 +33,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_leafref.sh b/test/test_leafref.sh index b0229a705..e9f0d5244 100755 --- a/test/test_leafref.sh +++ b/test/test_leafref.sh @@ -19,8 +19,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_leafref_augment.sh b/test/test_leafref_augment.sh index 6feca4d6a..afe93c646 100755 --- a/test/test_leafref_augment.sh +++ b/test/test_leafref_augment.sh @@ -43,8 +43,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_leafref_state.sh b/test/test_leafref_state.sh index b35597bd8..494c8fe4d 100755 --- a/test/test_leafref_state.sh +++ b/test/test_leafref_state.sh @@ -35,9 +35,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock false - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME true false diff --git a/test/test_leafref_union.sh b/test/test_leafref_union.sh index 90950979e..f72ecd8f7 100755 --- a/test/test_leafref_union.sh +++ b/test/test_leafref_union.sh @@ -19,8 +19,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_leafref_uses_augment.sh b/test/test_leafref_uses_augment.sh index 9101a1a4e..251f7e8e7 100755 --- a/test/test_leafref_uses_augment.sh +++ b/test/test_leafref_uses_augment.sh @@ -25,8 +25,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/lib/$APPNAME/backend /usr/local/var/$APPNAME false diff --git a/test/test_minmax.sh b/test/test_minmax.sh index 013562106..b61aa8282 100755 --- a/test/test_minmax.sh +++ b/test/test_minmax.sh @@ -17,8 +17,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_nacm.sh b/test/test_nacm.sh index 3e2584db5..9b84a3ca5 100755 --- a/test/test_nacm.sh +++ b/test/test_nacm.sh @@ -29,9 +29,9 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME internal true diff --git a/test/test_nacm_credentials.sh b/test/test_nacm_credentials.sh index ab8952b18..00cb48ea0 100755 --- a/test/test_nacm_credentials.sh +++ b/test/test_nacm_credentials.sh @@ -113,7 +113,7 @@ cat < $cfg $family $sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME internal true diff --git a/test/test_nacm_datanode.sh b/test/test_nacm_datanode.sh index 5f6ca8480..d8d888776 100755 --- a/test/test_nacm_datanode.sh +++ b/test/test_nacm_datanode.sh @@ -58,9 +58,9 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME internal true diff --git a/test/test_nacm_datanode_paths.sh b/test/test_nacm_datanode_paths.sh index 21800f0aa..22775332f 100755 --- a/test/test_nacm_datanode_paths.sh +++ b/test/test_nacm_datanode_paths.sh @@ -30,9 +30,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir /usr/local/lib/$APPNAME/restconf internal diff --git a/test/test_nacm_datanode_read.sh b/test/test_nacm_datanode_read.sh index 1e930684e..fe0ab2072 100755 --- a/test/test_nacm_datanode_read.sh +++ b/test/test_nacm_datanode_read.sh @@ -38,9 +38,9 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME internal true diff --git a/test/test_nacm_datanode_write.sh b/test/test_nacm_datanode_write.sh index 9a14b0cf0..77bef4484 100755 --- a/test/test_nacm_datanode_write.sh +++ b/test/test_nacm_datanode_write.sh @@ -30,9 +30,9 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME internal true diff --git a/test/test_nacm_default.sh b/test/test_nacm_default.sh index 75228f63e..926d0fbf0 100755 --- a/test/test_nacm_default.sh +++ b/test/test_nacm_default.sh @@ -26,9 +26,9 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true internal diff --git a/test/test_nacm_ext.sh b/test/test_nacm_ext.sh index eb4a1d782..7b51bae74 100755 --- a/test/test_nacm_ext.sh +++ b/test/test_nacm_ext.sh @@ -31,9 +31,9 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock false - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME external $nacmfile diff --git a/test/test_nacm_module_read.sh b/test/test_nacm_module_read.sh index a95d6e64d..1953fd753 100755 --- a/test/test_nacm_module_read.sh +++ b/test/test_nacm_module_read.sh @@ -31,9 +31,9 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME internal none diff --git a/test/test_nacm_module_write.sh b/test/test_nacm_module_write.sh index 96b54fc2b..7079b2559 100755 --- a/test/test_nacm_module_write.sh +++ b/test/test_nacm_module_write.sh @@ -44,10 +44,10 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock false /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME internal true diff --git a/test/test_nacm_protocol.sh b/test/test_nacm_protocol.sh index 4a8947fdb..c64f50221 100755 --- a/test/test_nacm_protocol.sh +++ b/test/test_nacm_protocol.sh @@ -47,9 +47,9 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME internal none diff --git a/test/test_nacm_recovery.sh b/test/test_nacm_recovery.sh index 403b0bff4..74e7f56af 100755 --- a/test/test_nacm_recovery.sh +++ b/test/test_nacm_recovery.sh @@ -75,9 +75,9 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME false $recovery diff --git a/test/test_netconf.sh b/test/test_netconf.sh index 99df8829b..c3946af0b 100755 --- a/test/test_netconf.sh +++ b/test/test_netconf.sh @@ -34,7 +34,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME true diff --git a/test/test_netconf_filter.sh b/test/test_netconf_filter.sh index fccb8d981..1bf0de65c 100755 --- a/test/test_netconf_filter.sh +++ b/test/test_netconf_filter.sh @@ -18,9 +18,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_netconf_framing.sh b/test/test_netconf_framing.sh index 24eee756d..0350385cf 100755 --- a/test/test_netconf_framing.sh +++ b/test/test_netconf_framing.sh @@ -28,7 +28,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME true diff --git a/test/test_netconf_hello.sh b/test/test_netconf_hello.sh index b055aad7b..01a4f4c2d 100755 --- a/test/test_netconf_hello.sh +++ b/test/test_netconf_hello.sh @@ -31,7 +31,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME true diff --git a/test/test_netconf_monitoring.sh b/test/test_netconf_monitoring.sh index 58919f4c3..9be071ffc 100755 --- a/test/test_netconf_monitoring.sh +++ b/test/test_netconf_monitoring.sh @@ -24,9 +24,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true diff --git a/test/test_netconf_monitoring_location.sh b/test/test_netconf_monitoring_location.sh index ae387ca90..3267d2f44 100755 --- a/test/test_netconf_monitoring_location.sh +++ b/test/test_netconf_monitoring_location.sh @@ -34,9 +34,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir $datapath $wdir diff --git a/test/test_netconf_monitoring_multiple.sh b/test/test_netconf_monitoring_multiple.sh index 0639f535a..f38d50220 100755 --- a/test/test_netconf_monitoring_multiple.sh +++ b/test/test_netconf_monitoring_multiple.sh @@ -22,9 +22,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true true diff --git a/test/test_netconf_notifications.sh b/test/test_netconf_notifications.sh index 5cea48643..058e857a1 100755 --- a/test/test_netconf_notifications.sh +++ b/test/test_netconf_notifications.sh @@ -31,10 +31,10 @@ cat < $cfg $cfg ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend example_backend.so$ - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_netconf_ssh_callhome.sh b/test/test_netconf_ssh_callhome.sh index a52e57f6d..c26e7bdb5 100755 --- a/test/test_netconf_ssh_callhome.sh +++ b/test/test_netconf_ssh_callhome.sh @@ -58,7 +58,7 @@ cat < $cfg /usr/local/lib/$APPNAME/netconf 1 $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_netconf_whitespace.sh b/test/test_netconf_whitespace.sh index b4fe28437..6162e407c 100755 --- a/test/test_netconf_whitespace.sh +++ b/test/test_netconf_whitespace.sh @@ -30,9 +30,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_openconfig.sh b/test/test_openconfig.sh index 3eb8f3976..7de6553cb 100755 --- a/test/test_openconfig.sh +++ b/test/test_openconfig.sh @@ -69,8 +69,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir ${AUTOCLI} diff --git a/test/test_openconfig_interfaces.sh b/test/test_openconfig_interfaces.sh index 7fddff8e4..043c721a6 100755 --- a/test/test_openconfig_interfaces.sh +++ b/test/test_openconfig_interfaces.sh @@ -35,8 +35,8 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir ${AUTOCLI} diff --git a/test/test_openconfig_network_instance.sh b/test/test_openconfig_network_instance.sh index 2936d6c03..fceb8fb4f 100755 --- a/test/test_openconfig_network_instance.sh +++ b/test/test_openconfig_network_instance.sh @@ -32,8 +32,8 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false diff --git a/test/test_order.sh b/test/test_order.sh index fb3c6a27e..4b386e8f5 100755 --- a/test/test_order.sh +++ b/test/test_order.sh @@ -38,9 +38,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/example/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dbdir $format diff --git a/test/test_pagination_config.sh b/test/test_pagination_config.sh index 05d56999a..c12ded681 100755 --- a/test/test_pagination_config.sh +++ b/test/test_pagination_config.sh @@ -42,9 +42,9 @@ cat < $cfg ${YANG_STANDARD_DIR}/ietf/RFC ${YANG_INSTALLDIR} $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir xml true diff --git a/test/test_pagination_draft.sh b/test/test_pagination_draft.sh index c96f33307..1afa881ef 100755 --- a/test/test_pagination_draft.sh +++ b/test/test_pagination_draft.sh @@ -29,9 +29,9 @@ cat < $cfg ${YANG_INSTALLDIR} $IETFRFC $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir json true diff --git a/test/test_pagination_state.sh b/test/test_pagination_state.sh index 16d22b710..c55bac98a 100755 --- a/test/test_pagination_state.sh +++ b/test/test_pagination_state.sh @@ -37,9 +37,9 @@ cat < $cfg ${YANG_INSTALLDIR} $IETFRFC $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir json true diff --git a/test/test_pattern.sh b/test/test_pattern.sh index b2c522f43..6c198a935 100755 --- a/test/test_pattern.sh +++ b/test/test_pattern.sh @@ -40,8 +40,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_perf_cli.sh b/test/test_perf_cli.sh index 6c405700b..4b4221565 100755 --- a/test/test_perf_cli.sh +++ b/test/test_perf_cli.sh @@ -58,8 +58,8 @@ cat < $cfg $dir ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/example/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/example/run/$APPNAME.pidfile $dir false $format diff --git a/test/test_perf_mem.sh b/test/test_perf_mem.sh index 6012313f4..d34449ccc 100755 --- a/test/test_perf_mem.sh +++ b/test/test_perf_mem.sh @@ -48,7 +48,7 @@ cat < $cfg $dir ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock $pidfile $dir false diff --git a/test/test_perf_netconf.sh b/test/test_perf_netconf.sh index f69acfd49..8234f4a9d 100755 --- a/test/test_perf_netconf.sh +++ b/test/test_perf_netconf.sh @@ -62,8 +62,8 @@ cat < $cfg $dir ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/example/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/example/run/$APPNAME.pidfile $dir false $format diff --git a/test/test_perf_restconf.sh b/test/test_perf_restconf.sh index 787aca782..be5fdc668 100755 --- a/test/test_perf_restconf.sh +++ b/test/test_perf_restconf.sh @@ -76,8 +76,8 @@ cat < $cfg $dir ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/example/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/example/run/$APPNAME.pidfile $dir false $format diff --git a/test/test_perf_restconf_ssl.sh b/test/test_perf_restconf_ssl.sh index eb00b877d..1ece3e5d8 100755 --- a/test/test_perf_restconf_ssl.sh +++ b/test/test_perf_restconf_ssl.sh @@ -92,8 +92,8 @@ cat < $cfg $dir ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/example/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/example/run/$APPNAME.pidfile $dir false $format diff --git a/test/test_perf_startup.sh b/test/test_perf_startup.sh index 517299b31..d410e40bb 100755 --- a/test/test_perf_startup.sh +++ b/test/test_perf_startup.sh @@ -58,8 +58,8 @@ cat < $cfg $dir ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/example/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/example/run/$APPNAME.pidfile $dir false example diff --git a/test/test_perf_state.sh b/test/test_perf_state.sh index bcb484a71..16e924db4 100755 --- a/test/test_perf_state.sh +++ b/test/test_perf_state.sh @@ -38,8 +38,8 @@ cat < $cfg clixon-restconf:allow-auth-none ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/example/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/example/run/$APPNAME.pidfile /usr/local/lib/$APPNAME/backend example_backend.so$ $dir diff --git a/test/test_perf_state_only.sh b/test/test_perf_state_only.sh index 8771ab5cf..7b4bc65a1 100755 --- a/test/test_perf_state_only.sh +++ b/test/test_perf_state_only.sh @@ -37,8 +37,8 @@ cat < $cfg clixon-restconf:allow-auth-none ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/example/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/example/run/$APPNAME.pidfile /usr/local/lib/$APPNAME/backend example_backend.so$ $dir diff --git a/test/test_privileges.sh b/test/test_privileges.sh index bae5ba2aa..4bcfb02ac 100755 --- a/test/test_privileges.sh +++ b/test/test_privileges.sh @@ -28,7 +28,7 @@ cat < $cfg ${YANG_INSTALLDIR} $fyang $dir/$APPNAME.sock - /var/tmp/$APPNAME.pidfile + /var/tmp/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_refine.sh b/test/test_refine.sh index 3a3b0e30d..125abe411 100755 --- a/test/test_refine.sh +++ b/test/test_refine.sh @@ -22,8 +22,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME true diff --git a/test/test_restconf.sh b/test/test_restconf.sh index ec8344b57..fcabc172f 100755 --- a/test/test_restconf.sh +++ b/test/test_restconf.sh @@ -106,8 +106,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME $RESTCONFIG diff --git a/test/test_restconf_basic_auth.sh b/test/test_restconf_basic_auth.sh index f8cbc0896..bbc9135d0 100755 --- a/test/test_restconf_basic_auth.sh +++ b/test/test_restconf_basic_auth.sh @@ -51,8 +51,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir true internal @@ -194,8 +194,8 @@ function testrun() /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir internal $anonymous diff --git a/test/test_restconf_callhome.sh b/test/test_restconf_callhome.sh index 1821a7dd2..c13de673a 100755 --- a/test/test_restconf_callhome.sh +++ b/test/test_restconf_callhome.sh @@ -71,7 +71,7 @@ cat < $cfg $dir false $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile internal $dir diff --git a/test/test_restconf_continue.sh b/test/test_restconf_continue.sh index e3b59b63c..7f1847e2e 100755 --- a/test/test_restconf_continue.sh +++ b/test/test_restconf_continue.sh @@ -35,7 +35,7 @@ cat < $cfg $cfg /usr/local/share/clixon $fyang - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock $dir/restconf.pidfile /usr/local/var/$APPNAME $RESTCONFIG diff --git a/test/test_restconf_err.sh b/test/test_restconf_err.sh index cd545f64b..7671ec532 100755 --- a/test/test_restconf_err.sh +++ b/test/test_restconf_err.sh @@ -62,7 +62,7 @@ cat < $cfg ${YANG_INSTALLDIR} $dir $fyang - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock $dir/restconf.pidfile /usr/local/lib/$APPNAME/backend example_backend.so$ diff --git a/test/test_restconf_http_upgrade.sh b/test/test_restconf_http_upgrade.sh index 572d23126..49b07e51c 100755 --- a/test/test_restconf_http_upgrade.sh +++ b/test/test_restconf_http_upgrade.sh @@ -43,8 +43,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME true $RESTCONFIG diff --git a/test/test_restconf_internal.sh b/test/test_restconf_internal.sh index 9eb4538da..c527ba933 100755 --- a/test/test_restconf_internal.sh +++ b/test/test_restconf_internal.sh @@ -61,8 +61,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir true /usr/local/sbin diff --git a/test/test_restconf_internal_usecases.sh b/test/test_restconf_internal_usecases.sh index b857e57d5..dcec45d0e 100755 --- a/test/test_restconf_internal_usecases.sh +++ b/test/test_restconf_internal_usecases.sh @@ -75,8 +75,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir true /usr/local/sbin diff --git a/test/test_restconf_jukebox.sh b/test/test_restconf_jukebox.sh index c73d79cae..0ed305e1d 100755 --- a/test/test_restconf_jukebox.sh +++ b/test/test_restconf_jukebox.sh @@ -33,7 +33,7 @@ cat < $cfg clixon-restconf:allow-auth-none ${YANG_INSTALLDIR} $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend $dir/restconf.pidfile /usr/local/var/$APPNAME diff --git a/test/test_restconf_listkey.sh b/test/test_restconf_listkey.sh index 28ebcd1ee..cead75957 100755 --- a/test/test_restconf_listkey.sh +++ b/test/test_restconf_listkey.sh @@ -21,7 +21,7 @@ cat < $cfg clixon-restconf:allow-auth-none ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock $dir/restconf.pidfile /usr/local/var/$APPNAME false diff --git a/test/test_restconf_netns.sh b/test/test_restconf_netns.sh index 0387c71d2..f2cf60842 100755 --- a/test/test_restconf_netns.sh +++ b/test/test_restconf_netns.sh @@ -109,8 +109,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir $RESTCONFIG @@ -290,8 +290,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir $RESTCONFIG diff --git a/test/test_restconf_nmap.sh b/test/test_restconf_nmap.sh index e93205f0f..ed807e36d 100755 --- a/test/test_restconf_nmap.sh +++ b/test/test_restconf_nmap.sh @@ -95,8 +95,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME $RESTCONFIG diff --git a/test/test_restconf_noalpn.sh b/test/test_restconf_noalpn.sh index b603d8fa4..ce328a22a 100755 --- a/test/test_restconf_noalpn.sh +++ b/test/test_restconf_noalpn.sh @@ -74,7 +74,7 @@ cat < $cfg $cfg ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock $dir/restconf.pidfile /usr/local/var/$APPNAME diff --git a/test/test_restconf_notifications.sh b/test/test_restconf_notifications.sh index bc521088b..2556aa9e4 100755 --- a/test/test_restconf_notifications.sh +++ b/test/test_restconf_notifications.sh @@ -66,10 +66,10 @@ cat < $cfg clixon-restconf:allow-auth-none ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend example_backend.so$ - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli diff --git a/test/test_restconf_op.sh b/test/test_restconf_op.sh index ed050c766..6f960e99c 100755 --- a/test/test_restconf_op.sh +++ b/test/test_restconf_op.sh @@ -23,7 +23,7 @@ cat < $cfg $cfg ${YANG_INSTALLDIR} $fyang - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock $dir/restconf.pidfile /usr/local/var/$APPNAME $RESTCONFIG diff --git a/test/test_restconf_plain_patch.sh b/test/test_restconf_plain_patch.sh index 1126723a5..7a75d0ad0 100755 --- a/test/test_restconf_plain_patch.sh +++ b/test/test_restconf_plain_patch.sh @@ -20,7 +20,7 @@ cat < $cfg $cfg ${YANG_INSTALLDIR} $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock ietf-netconf:startup /usr/local/lib/$APPNAME/restconf $dir/restconf.pidfile diff --git a/test/test_restconf_ssl_certs.sh b/test/test_restconf_ssl_certs.sh index eb94926a6..f4fc74584 100755 --- a/test/test_restconf_ssl_certs.sh +++ b/test/test_restconf_ssl_certs.sh @@ -197,8 +197,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir true internal diff --git a/test/test_restconf_startup.sh b/test/test_restconf_startup.sh index 75c0605fe..ee53df4f7 100755 --- a/test/test_restconf_startup.sh +++ b/test/test_restconf_startup.sh @@ -45,8 +45,8 @@ cat < $cfg /usr/local/lib/$APPNAME/backend example_backend.so$ /usr/local/lib/$APPNAME/restconf - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir $RESTCONFIG diff --git a/test/test_restconf_yang_patch_json.sh b/test/test_restconf_yang_patch_json.sh index 96d8df09b..5d7149757 100755 --- a/test/test_restconf_yang_patch_json.sh +++ b/test/test_restconf_yang_patch_json.sh @@ -28,7 +28,7 @@ cat < $cfg $cfg ${YANG_INSTALLDIR} $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock ietf-netconf:startup /usr/local/lib/$APPNAME/restconf $dir/restconf.pidfile diff --git a/test/test_restconf_yang_patch_xml.sh b/test/test_restconf_yang_patch_xml.sh index 039ea4f18..c8b7e4eec 100755 --- a/test/test_restconf_yang_patch_xml.sh +++ b/test/test_restconf_yang_patch_xml.sh @@ -29,7 +29,7 @@ cat < $cfg $cfg ${YANG_INSTALLDIR} $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock ietf-netconf:startup /usr/local/lib/$APPNAME/restconf $dir/restconf.pidfile diff --git a/test/test_rpc.sh b/test/test_rpc.sh index fa3080b49..0b8f3ce8d 100755 --- a/test/test_rpc.sh +++ b/test/test_rpc.sh @@ -28,8 +28,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME $RESTCONFIG diff --git a/test/test_snmp_entity.sh b/test/test_snmp_entity.sh index 038e74fda..5a23879c1 100755 --- a/test/test_snmp_entity.sh +++ b/test/test_snmp_entity.sh @@ -31,7 +31,7 @@ cat < $cfg $fyang $dir/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /var/tmp/$APPNAME.pidfile + /var/tmp/run/$APPNAME.pidfile $dir unix:$SOCK ENTITY-MIB diff --git a/test/test_snmp_get.sh b/test/test_snmp_get.sh index 79009dbaa..fc09f90f7 100755 --- a/test/test_snmp_get.sh +++ b/test/test_snmp_get.sh @@ -31,7 +31,7 @@ cat < $cfg $fyang $dir/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /var/tmp/$APPNAME.pidfile + /var/tmp/run/$APPNAME.pidfile $dir unix:$SOCK CLIXON-TYPES-MIB diff --git a/test/test_snmp_ifmib.sh b/test/test_snmp_ifmib.sh index 3b6261ef6..72a3c6559 100755 --- a/test/test_snmp_ifmib.sh +++ b/test/test_snmp_ifmib.sh @@ -31,7 +31,7 @@ cat < $cfg $fyang $dir/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /var/tmp/$APPNAME.pidfile + /var/tmp/run/$APPNAME.pidfile $dir unix:$SOCK IF-MIB diff --git a/test/test_snmp_rowstatus.sh b/test/test_snmp_rowstatus.sh index eb9382d4d..b651e621e 100755 --- a/test/test_snmp_rowstatus.sh +++ b/test/test_snmp_rowstatus.sh @@ -31,7 +31,7 @@ cat < $cfg ${MIB_GENERATED_YANG_DIR} $fyang $dir/$APPNAME.sock - /var/tmp/$APPNAME.pidfile + /var/tmp/run/$APPNAME.pidfile $dir unix:$SOCK SNMP-NOTIFICATION-MIB diff --git a/test/test_snmp_set.sh b/test/test_snmp_set.sh index 358295ac1..479693b53 100755 --- a/test/test_snmp_set.sh +++ b/test/test_snmp_set.sh @@ -33,7 +33,7 @@ cat < $cfg ${MIB_GENERATED_YANG_DIR} $fyang $dir/$APPNAME.sock - /var/tmp/$APPNAME.pidfile + /var/tmp/run/$APPNAME.pidfile /usr/local/lib/$APPNAME/backend $dir unix:$SOCK diff --git a/test/test_snmp_system.sh b/test/test_snmp_system.sh index e5749dd9f..deb84e751 100755 --- a/test/test_snmp_system.sh +++ b/test/test_snmp_system.sh @@ -31,7 +31,7 @@ cat < $cfg $fyang $dir/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /var/tmp/$APPNAME.pidfile + /var/tmp/run/$APPNAME.pidfile $dir unix:$SOCK SNMPv2-MIB diff --git a/test/test_snmp_union.sh b/test/test_snmp_union.sh index 49fab3f40..93468327b 100755 --- a/test/test_snmp_union.sh +++ b/test/test_snmp_union.sh @@ -31,7 +31,7 @@ cat < $cfg $fyang $dir/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /var/tmp/$APPNAME.pidfile + /var/tmp/run/$APPNAME.pidfile $dir unix:$SOCK clixon-example diff --git a/test/test_sock.sh b/test/test_sock.sh index 54799c791..c9a1074b9 100755 --- a/test/test_sock.sh +++ b/test/test_sock.sh @@ -44,7 +44,7 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME init false diff --git a/test/test_startup.sh b/test/test_startup.sh index c068b299c..9cb74b3e5 100755 --- a/test/test_startup.sh +++ b/test/test_startup.sh @@ -34,8 +34,8 @@ cat < $cfg /usr/local/lib/$APPNAME/restconf /usr/local/lib/$APPNAME/cli /usr/local/lib/$APPNAME/clispec - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir 0 init diff --git a/test/test_submodule.sh b/test/test_submodule.sh index c7039422b..ed0908cf1 100755 --- a/test/test_submodule.sh +++ b/test/test_submodule.sh @@ -41,8 +41,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile example_backend.so$ /usr/local/lib/$APPNAME/restconf /usr/local/var/$APPNAME diff --git a/test/test_transaction.sh b/test/test_transaction.sh index 337f8f34c..1745d9cac 100755 --- a/test/test_transaction.sh +++ b/test/test_transaction.sh @@ -107,7 +107,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_transaction_restart.sh b/test/test_transaction_restart.sh index c4662b46c..0781bc97a 100755 --- a/test/test_transaction_restart.sh +++ b/test/test_transaction_restart.sh @@ -50,7 +50,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_type.sh b/test/test_type.sh index 1e44983fa..8770e7abb 100755 --- a/test/test_type.sh +++ b/test/test_type.sh @@ -239,8 +239,8 @@ function testrun(){ /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME $dbcache $format diff --git a/test/test_type_range.sh b/test/test_type_range.sh index 536ac6ff0..8161effb8 100755 --- a/test/test_type_range.sh +++ b/test/test_type_range.sh @@ -177,8 +177,8 @@ cat < $cfg $dclispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME $format diff --git a/test/test_union.sh b/test/test_union.sh index f49de56a6..9cdb27419 100755 --- a/test/test_union.sh +++ b/test/test_union.sh @@ -21,8 +21,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_unique.sh b/test/test_unique.sh index 3450e99a2..043eeec56 100755 --- a/test/test_unique.sh +++ b/test/test_unique.sh @@ -23,8 +23,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_unique_descendant.sh b/test/test_unique_descendant.sh index 33c1e1f38..e39f5fb03 100755 --- a/test/test_unique_descendant.sh +++ b/test/test_unique_descendant.sh @@ -18,8 +18,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_upgrade_auto.sh b/test/test_upgrade_auto.sh index ddaa3480f..cf6cff76b 100755 --- a/test/test_upgrade_auto.sh +++ b/test/test_upgrade_auto.sh @@ -178,9 +178,9 @@ cat < $cfg ietf-netconf:startup ${YANG_INSTALLDIR} $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/example/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true true diff --git a/test/test_upgrade_checkold.sh b/test/test_upgrade_checkold.sh index 14102853d..e79eacfa7 100755 --- a/test/test_upgrade_checkold.sh +++ b/test/test_upgrade_checkold.sh @@ -26,9 +26,9 @@ cat < $cfg ietf-netconf:startup ${YANG_INSTALLDIR} $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/example/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile true $changelog $dir diff --git a/test/test_upgrade_failsafe.sh b/test/test_upgrade_failsafe.sh index df132aa52..3e1bd9f28 100755 --- a/test/test_upgrade_failsafe.sh +++ b/test/test_upgrade_failsafe.sh @@ -100,9 +100,9 @@ cat < $cfg ${YANG_INSTALLDIR} $dir $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/example/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true false diff --git a/test/test_upgrade_interfaces.sh b/test/test_upgrade_interfaces.sh index d65ce20d1..0fecffe25 100755 --- a/test/test_upgrade_interfaces.sh +++ b/test/test_upgrade_interfaces.sh @@ -38,9 +38,9 @@ cat < $cfg interfaces:if-mib $dir $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/example/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true false diff --git a/test/test_upgrade_interfaces_rfc7895.sh b/test/test_upgrade_interfaces_rfc7895.sh index 597331cf8..885e52273 100755 --- a/test/test_upgrade_interfaces_rfc7895.sh +++ b/test/test_upgrade_interfaces_rfc7895.sh @@ -38,9 +38,9 @@ cat < $cfg interfaces:if-mib $dir $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/example/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true false diff --git a/test/test_upgrade_module.sh b/test/test_upgrade_module.sh index 26574a672..fc334108a 100755 --- a/test/test_upgrade_module.sh +++ b/test/test_upgrade_module.sh @@ -60,9 +60,9 @@ cat < $cfg ietf-netconf:startup ${YANG_INSTALLDIR} $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/example/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true false diff --git a/test/test_upgrade_quit.sh b/test/test_upgrade_quit.sh index ed4165f8a..d6a170825 100755 --- a/test/test_upgrade_quit.sh +++ b/test/test_upgrade_quit.sh @@ -24,9 +24,9 @@ cat < $cfg ${YANG_INSTALLDIR} interfaces:if-mib $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/example/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true false diff --git a/test/test_upgrade_repair.sh b/test/test_upgrade_repair.sh index 3d5c208b6..75c118410 100755 --- a/test/test_upgrade_repair.sh +++ b/test/test_upgrade_repair.sh @@ -61,9 +61,9 @@ cat < $cfg ${YANG_INSTALLDIR} $dir $dir - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/example/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true /usr/local/lib/$APPNAME/clispec diff --git a/test/test_when_mandatory.sh b/test/test_when_mandatory.sh index 71a69dbd9..7d22ce254 100755 --- a/test/test_when_mandatory.sh +++ b/test/test_when_mandatory.sh @@ -23,8 +23,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_when_must.sh b/test/test_when_must.sh index 619448192..4a95e3164 100755 --- a/test/test_when_must.sh +++ b/test/test_when_must.sh @@ -18,8 +18,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_with_default.sh b/test/test_with_default.sh index 916c8be63..85a16cf3b 100755 --- a/test/test_with_default.sh +++ b/test/test_with_default.sh @@ -33,7 +33,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_xml_trees.sh b/test/test_xml_trees.sh index 34fd27e05..e5dd24910 100755 --- a/test/test_xml_trees.sh +++ b/test/test_xml_trees.sh @@ -22,8 +22,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_xpath_functions.sh b/test/test_xpath_functions.sh index 8c2953ddb..8745ecbc7 100755 --- a/test/test_xpath_functions.sh +++ b/test/test_xpath_functions.sh @@ -27,8 +27,8 @@ cat < $cfg /usr/local/lib/$APPNAME/netconf /usr/local/lib/$APPNAME/backend $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME false diff --git a/test/test_yang.sh b/test/test_yang.sh index cf9942415..406de0fda 100755 --- a/test/test_yang.sh +++ b/test/test_yang.sh @@ -22,8 +22,8 @@ cat < $cfg $clispec /usr/local/lib/$APPNAME/cli example - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_yang_action.sh b/test/test_yang_action.sh index ea7ec4029..32bed85f1 100755 --- a/test/test_yang_action.sh +++ b/test/test_yang_action.sh @@ -19,9 +19,9 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_yang_anydata.sh b/test/test_yang_anydata.sh index 0d85caa79..8b04b9475 100755 --- a/test/test_yang_anydata.sh +++ b/test/test_yang_anydata.sh @@ -140,8 +140,8 @@ function testrun() /usr/local/lib/$APPNAME/netconf /usr/local/lib/$APPNAME/backend $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false $unknown diff --git a/test/test_yang_bind.sh b/test/test_yang_bind.sh index 9f3b51987..fe6dd2ac2 100755 --- a/test/test_yang_bind.sh +++ b/test/test_yang_bind.sh @@ -34,8 +34,8 @@ cat < $cfg /usr/local/lib/$APPNAME/netconf /usr/local/lib/$APPNAME/backend $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir EOF diff --git a/test/test_yang_default.sh b/test/test_yang_default.sh index f9c32e203..688adfcda 100755 --- a/test/test_yang_default.sh +++ b/test/test_yang_default.sh @@ -30,7 +30,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir false diff --git a/test/test_yang_deviation.sh b/test/test_yang_deviation.sh index 9eddbb695..de4586fa1 100755 --- a/test/test_yang_deviation.sh +++ b/test/test_yang_deviation.sh @@ -24,8 +24,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_yang_extension.sh b/test/test_yang_extension.sh index 01a83cda5..2d09b6a86 100755 --- a/test/test_yang_extension.sh +++ b/test/test_yang_extension.sh @@ -36,8 +36,8 @@ cat < $cfg /usr/local/lib/$APPNAME/netconf /usr/local/lib/$APPNAME/backend $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME true diff --git a/test/test_yang_load.sh b/test/test_yang_load.sh index a7f51c987..b236e413d 100755 --- a/test/test_yang_load.sh +++ b/test/test_yang_load.sh @@ -63,8 +63,8 @@ cat < $cfg $dir ${YANG_INSTALLDIR} $fyang1 - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli @@ -115,8 +115,8 @@ cat < $cfg $dir ${YANG_INSTALLDIR} $fyang2 - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli @@ -162,8 +162,8 @@ cat < $cfg $dir ${YANG_INSTALLDIR} example - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF @@ -205,8 +205,8 @@ cat < $cfg ${YANG_INSTALLDIR} example $OLDDATE - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF @@ -248,8 +248,8 @@ cat < $cfg $dir ${YANG_INSTALLDIR} $dir - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF @@ -293,8 +293,8 @@ cat < $cfg ${YANG_INSTALLDIR} $dir $fyang2 - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF @@ -338,8 +338,8 @@ cat < $cfg $dir example $OLDDATE - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF @@ -383,8 +383,8 @@ cat < $cfg $fyang2 example $NEWDATE - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_yang_models_ieee.sh b/test/test_yang_models_ieee.sh index 88b09e8db..506296aad 100755 --- a/test/test_yang_models_ieee.sh +++ b/test/test_yang_models_ieee.sh @@ -30,8 +30,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_yang_models_ietf.sh b/test/test_yang_models_ietf.sh index e1752c360..7282992ff 100755 --- a/test/test_yang_models_ietf.sh +++ b/test/test_yang_models_ietf.sh @@ -34,8 +34,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME EOF diff --git a/test/test_yang_namespace.sh b/test/test_yang_namespace.sh index 720674ede..8c8e343d0 100755 --- a/test/test_yang_namespace.sh +++ b/test/test_yang_namespace.sh @@ -25,8 +25,8 @@ cat < $cfg /usr/local/lib/$APPNAME/clispec /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile /usr/local/var/$APPNAME $RESTCONFIG diff --git a/test/test_yang_schema_mount.sh b/test/test_yang_schema_mount.sh index 658227713..baeddabe8 100755 --- a/test/test_yang_schema_mount.sh +++ b/test/test_yang_schema_mount.sh @@ -28,9 +28,9 @@ cat < $cfg $dir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock + /usr/local/var/run/$APPNAME.sock /usr/local/lib/$APPNAME/backend - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile $dir true true diff --git a/test/test_yang_wdcc.sh b/test/test_yang_wdcc.sh index fd394f86b..bf816ec61 100755 --- a/test/test_yang_wdcc.sh +++ b/test/test_yang_wdcc.sh @@ -30,7 +30,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile false $dir false diff --git a/test/test_yang_when.sh b/test/test_yang_when.sh index ef801d1b4..4ea1335f0 100755 --- a/test/test_yang_when.sh +++ b/test/test_yang_when.sh @@ -34,8 +34,8 @@ cat < $cfg $clidir /usr/local/lib/$APPNAME/cli $APPNAME - /usr/local/var/$APPNAME/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.sock + /usr/local/var/run/$APPNAME.pidfile $dir false ${AUTOCLI} diff --git a/test/test_yang_with_defaults.sh b/test/test_yang_with_defaults.sh index 194ccf5c6..23004464e 100755 --- a/test/test_yang_with_defaults.sh +++ b/test/test_yang_with_defaults.sh @@ -33,7 +33,7 @@ cat < $cfg /usr/local/lib/$APPNAME/cli $APPNAME $dir/$APPNAME.sock - /usr/local/var/$APPNAME/$APPNAME.pidfile + /usr/local/var/run/$APPNAME.pidfile false $dir false