Skip to content

Commit

Permalink
Added links in config
Browse files Browse the repository at this point in the history
  • Loading branch information
grodansparadis committed Aug 22, 2018
1 parent 44b1b7f commit 081f6f2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -207,10 +207,10 @@ clean:
rm -f config.log
rm -f config.startup
rm -f config.status
rm -r m4/Makefile

distclean: clean
@sh clean_for_dist
rm -f m4/Makefile

deb:
@for d in $(PROJ_SUBDIRS); do (echo "====================================================" &&\
Expand Down
11 changes: 8 additions & 3 deletions install_files/unix/vscpd.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version = "1.0" encoding = "UTF-8" ?>

<!--
2017-11-17
2018-08-22
Example configuration file Unix
Ake Hedman, [email protected]
http://www.grodansparadis.com
Documentation for this configuration file is available
here http://www.vscp.org/docs/vscpd/doku.php?id=configuring_the_vscp_daemon
here https://grodansparadis.gitbooks.io/the-vscp-daemon/configuring_the_vscp_daemon.html

All settings in this configuration file except enteries in the general section,
can be done in the configuration database as well. This allows for easier
Expand Down Expand Up @@ -93,6 +93,7 @@
"127.0.0.1:9598" only will listen on the specified interface.
To specify several interfaces just enter them with a space
between them.
Documented here https://grodansparadis.gitbooks.io/the-vscp-daemon/configuring_the_vscp_daemon.html#tcpip-client-interface
-->
<tcpip enable="true"
interface="9598" />
Expand All @@ -119,6 +120,7 @@
algorithm to use "AEA128", "AES192", "AES256"
bBrodcast Set to true to set broadcast flag on socket.
MG_F_ENABLE_BROADCAST
Documented here https://grodansparadis.gitbooks.io/the-vscp-daemon/configuring_the_vscp_daemon.html#udp-interface
-->
<udp enable="true"
interface="udp://44444"
Expand Down Expand Up @@ -166,6 +168,7 @@
"AES192" and "AES256" are valid settings.
bSendAck - if set to "true" ACK frams are sent when a
datagram is received.
Documented here https://grodansparadis.gitbooks.io/the-vscp-daemon/configuring_the_vscp_daemon.html#multicast-channel-interface
-->
<multicast enable="true">
<channel enable="true"
Expand All @@ -188,6 +191,7 @@
Set to true to enable decision matrix
Set to false to disable.
Set path to the decision matrix file location
Documented here https://grodansparadis.gitbooks.io/the-vscp-daemon/files_and_directory_structure.html
-->
<dm enable="true"
path="/srv/vscp/dm.xml"
Expand All @@ -197,6 +201,7 @@
Set to true to enable daemon variables
Set to false to disable.
Path to variables storage.
Documented here https://grodansparadis.gitbooks.io/the-vscp-daemon/configuring_the_vscp_daemon.html#remote-variables
-->
<variables pathxml="/srv/vscp/variables.xml"
path="/srv/vscp/variables.sqlite3"
Expand All @@ -206,7 +211,7 @@
Settings for the internal webserver.

Documented here
http://www.vscp.org/docs/vscpd/doku.php?id=configuring_the_vscp_daemon#webserver
https://grodansparadis.gitbooks.io/the-vscp-daemon/configuring_the_vscp_daemon.html#webserver
-->

<webserver enable="true"
Expand Down
4 changes: 2 additions & 2 deletions src/vscp/common/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
#define VSCPD_MAJOR_VERSION 13
#define VSCPD_MINOR_VERSION 1
#define VSCPD_RELEASE_VERSION 0
#define VSCPD_BUILD_VERSION 7
#define VSCPD_BUILD_VERSION 9

#define VSCPD_DISPLAY_VERSION "13.1.0.7 Aluminium"
#define VSCPD_DISPLAY_VERSION "13.1.0.9 Aluminium"

#define VSCPD_COPYRIGHT "Copyright (C) 2000-2018, Grodans Paradis AB, https://www.grodansparadis.com"
#define VSCPD_COPYRIGHT_HTML "Copyright (C) 2000-2018, <a href=\"mailto:[email protected]\">Grodans Paradis AB</a>, <a hrefs=\"https://www.grodansparadis.com\">https://www.grodansparadis.com</a>"
Expand Down

0 comments on commit 081f6f2

Please sign in to comment.