Skip to content
Snippets Groups Projects
Commit 66176be9 authored by alexander.lysikov's avatar alexander.lysikov
Browse files

Merge branch 'master' into HEAD

# Conflicts:
#	CMakeLists.txt
parents 2a4bd4a0 bf6737bf
No related branches found
No related tags found
3 merge requests!15Feature 2336a,!12Master,!11Feature 2336a
# kelvin-node
Kelvin Blockchain node
[![Build Status](https://travis-ci.com/cellframe/kelvin-node.svg?branch=master)](https://travis-ci.com/cellframe/kelvin-node)
[![Build Status](https://travis-ci.com/osetrovich/kelvin-node-ci.svg?branch=master)](https://travis-ci.com/osetrovich/kelvin-node-ci)
[Kelvin node manual](https://github.com/cellframe/kelvin-node/wiki/Kelvin-Node)
......
......@@ -102,23 +102,7 @@
#include "dap_process_manager.h"
#include "dap_traffic_track.h"
#define DAP_APP_NAME NODE_NETNAME "-node"
#ifdef _WIN32
#define SYSTEM_PREFIX "opt/"DAP_APP_NAME
#else
#define SYSTEM_PREFIX "/opt/"DAP_APP_NAME
#endif
#define LOCAL_PREFIX "~/."DAP_APP_NAME
#define SYSTEM_CONFIGS_DIR SYSTEM_PREFIX"/etc"
#define LOCAL_CONFIGS_DIR LOCAL_PREFIX"/etc"
#define SYSTEM_CONFIG_GLOBAL_FILENAME SYSTEM_PREFIX"/etc/"DAP_APP_NAME".cfg"
#define LOCAL_CONFIG_GLOBAL LOCAL_PREFIX"/etc/"DAP_APP_NAME".cfg"
#define SYSTEM_PID_FILE_PATH SYSTEM_PREFIX"/run/"DAP_APP_NAME".pid"
#define LOCAL_PID_FILE_PATH SYSTEM_PREFIX"/run/"DAP_APP_NAME".pid"
#include "dap_defines.h"
#define ENC_HTTP_URL "/enc_init"
#define STREAM_CTL_URL "/stream_ctl"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment