diff options
| author | Anton <anton@picapica> | 2018-09-08 21:04:38 +0400 |
|---|---|---|
| committer | Anton <anton@picapica> | 2018-09-08 21:04:38 +0400 |
| commit | 16d6a787ae5438663061e96771e64ffdb08d1da1 (patch) | |
| tree | 3ffb93dea13c2cb7f19b8f6a8d08a34b97a5346c | |
| parent | 1573ce392b636efa33ea8f777bb745414a9472f8 (diff) | |
| download | pica-pica-16d6a787ae5438663061e96771e64ffdb08d1da1.tar.gz pica-pica-16d6a787ae5438663061e96771e64ffdb08d1da1.zip | |
remove config option for CA file, add config option for DH param file, update default config and manpage
| -rw-r--r-- | PICA_nodeconfig.c | 2 | ||||
| -rw-r--r-- | PICA_nodeconfig.h | 4 | ||||
| -rw-r--r-- | pica-node.conf | 9 | ||||
| -rw-r--r-- | pica-node.conf.5 | 6 |
4 files changed, 8 insertions, 13 deletions
diff --git a/PICA_nodeconfig.c b/PICA_nodeconfig.c index f389226..68439bb 100644 --- a/PICA_nodeconfig.c +++ b/PICA_nodeconfig.c @@ -37,7 +37,7 @@ int PICA_nodeconfig_load(const char *config_file) nodecfg.announced_addr = strdup(iniparser_getstring(d, "pica-node:announced_addr", PICA_NODECONFIG_DEF_ANNOUNCED_ADDR)); nodecfg.listen_port = strdup(iniparser_getstring(d, "pica-node:listen_port", PICA_NODECONFIG_DEF_LISTEN_PORT)); nodecfg.nodes_db_file = strdup(iniparser_getstring(d, "pica-node:nodes_db_file", PICA_NODECONFIG_DEF_NODES_DB_FILE)); - nodecfg.CA_cert_file = strdup(iniparser_getstring(d, "pica-node:CA_cert_file", PICA_NODECONFIG_DEF_CA_CERT_FILE)); + nodecfg.dh_param_file = strdup(iniparser_getstring(d, "pica-node:dh_param_file", PICA_NODECONFIG_DEF_DH_PARAM_FILE)); nodecfg.disable_reserved_addrs = iniparser_getboolean(d, "pica-node:disable_reserved_addrs", 1); iniparser_freedict(d); diff --git a/PICA_nodeconfig.h b/PICA_nodeconfig.h index 10d29ac..13ca79b 100644 --- a/PICA_nodeconfig.h +++ b/PICA_nodeconfig.h @@ -35,7 +35,7 @@ #define PICA_NODECONFIG_DEF_LISTEN_PORT "2299" #define PICA_NODECONFIG_DEF_NODES_DB_FILE PICA_LOCALSTATEDIR"/lib/pica-node/nodelist.db" #define PICA_NODECONFIG_DEF_CONFIG_FILE PICA_SYSCONFDIR"/pica-node.conf" -#define PICA_NODECONFIG_DEF_CA_CERT_FILE PICA_INSTALLPREFIX"/share/pica-node/CA.pem" +#define PICA_NODECONFIG_DEF_DH_PARAM_FILE PICA_INSTALLPREFIX"/share/pica-node/dhparam4096.pem" struct nodeconfig { @@ -43,7 +43,7 @@ struct nodeconfig char *listen_port; char *nodes_db_file; char *config_file; - char *CA_cert_file; + char *dh_param_file; int disable_reserved_addrs; //int conn_speed_limit; }; diff --git a/pica-node.conf b/pica-node.conf index fc44085..ece06f0 100644 --- a/pica-node.conf +++ b/pica-node.conf @@ -25,13 +25,8 @@ # #nodes_db_file = "/var/lib/pica-node/nodelist.db"; - -#Path to Pica Pica root Certificate Authority certificate. -#Change only if you need to run Pica Pica software in custom environment with your own certificates. -#Default is $(prefix)/share/pica-node/CA.pem if configure script was used for building pica-node, -#/usr/share/pica-node/CA.pem otherwise. -# -#CA_cert_file = "/usr/share/pica-node/CA.pem"; +#Path to Diffie-Hellman parameters file. +dh_param_file = "/usr/share/pica-node/dhparam4096.pem"; #Disables usage of node addresses from reserved IP ranges. Default is "yes". Only global routable Internet #addresses are accepted. diff --git a/pica-node.conf.5 b/pica-node.conf.5 index f0c7ff2..74b23e4 100644 --- a/pica-node.conf.5 +++ b/pica-node.conf.5 @@ -33,9 +33,9 @@ info about available nodes (their address, port, last seen online, etc). The default is .I /var/lib/pica-node/nodelist.db .TP -.I CA_cert_file -Specifies the path to CA certificate in .pem format. The default is -.I /usr/share/pica-node/CA.pem +.I dh_param_file +Specifies the path to DH parameters file in .pem format. The default is +.I /usr/share/pica-node/dhparam4096.pem .TP .I disable_reserved_addrs Disables usage of reserved IP ranges (127.0.0.0/8, 10.0.0.0/8, 192.168.0.0/16 and others). |