diff options
-rw-r--r-- | other/bootstrap_serverdaemon/Makefile.inc | 10 | ||||
-rw-r--r-- | other/bootstrap_serverdaemon/README.md | 22 | ||||
-rw-r--r-- | other/bootstrap_serverdaemon/conf | 4 | ||||
-rw-r--r-- | other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon (renamed from other/bootstrap_serverdaemon/tox-dht-bootstrap-server-daemon) | 4 | ||||
-rw-r--r-- | other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon.c (renamed from other/bootstrap_serverdaemon/tox-dht-bootstrap-server-daemon.c) | 8 |
5 files changed, 24 insertions, 24 deletions
diff --git a/other/bootstrap_serverdaemon/Makefile.inc b/other/bootstrap_serverdaemon/Makefile.inc index 2607bfee..3731807c 100644 --- a/other/bootstrap_serverdaemon/Makefile.inc +++ b/other/bootstrap_serverdaemon/Makefile.inc | |||
@@ -1,17 +1,17 @@ | |||
1 | if BUILD_DHT_BOOTSTRAP_DAEMON | 1 | if BUILD_DHT_BOOTSTRAP_DAEMON |
2 | 2 | ||
3 | noinst_PROGRAMS += tox-dht-bootstrap-server-daemon | 3 | noinst_PROGRAMS += tox_dht_bootstrap_server_daemon |
4 | 4 | ||
5 | DHT_bootstrap_daemon_SOURCES = \ | 5 | tox_dht_bootstrap_server_daemon_SOURCES = \ |
6 | ../other/bootstrap_serverdaemon/tox-dht-bootstrap-server-daemon.c | 6 | ../other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon.c |
7 | 7 | ||
8 | DHT_bootstrap_daemon_CFLAGS = \ | 8 | tox_dht_bootstrap_server_daemon_CFLAGS = \ |
9 | -I$(top_srcdir)/other/bootstrap_serverdaemon \ | 9 | -I$(top_srcdir)/other/bootstrap_serverdaemon \ |
10 | $(LIBSODIUM_CFLAGS) \ | 10 | $(LIBSODIUM_CFLAGS) \ |
11 | $(NACL_CFLAGS) \ | 11 | $(NACL_CFLAGS) \ |
12 | $(LIBCONFIG_CFLAGS) | 12 | $(LIBCONFIG_CFLAGS) |
13 | 13 | ||
14 | DHT_bootstrap_daemon_LDADD = \ | 14 | tox_dht_bootstrap_server_daemon_LDADD = \ |
15 | $(LIBSODIUM_LDFLAGS) \ | 15 | $(LIBSODIUM_LDFLAGS) \ |
16 | $(NACL_LDFLAGS) \ | 16 | $(NACL_LDFLAGS) \ |
17 | libtoxcore.la \ | 17 | libtoxcore.la \ |
diff --git a/other/bootstrap_serverdaemon/README.md b/other/bootstrap_serverdaemon/README.md index 97a952f4..1075fe10 100644 --- a/other/bootstrap_serverdaemon/README.md +++ b/other/bootstrap_serverdaemon/README.md | |||
@@ -2,43 +2,43 @@ | |||
2 | 2 | ||
3 | The following commands are to be executed as root: | 3 | The following commands are to be executed as root: |
4 | 4 | ||
5 | 1. In `tox-dht-bootstrap-server-daemon` file change: | 5 | 1. In `tox_dht_bootstrap_server_daemon` file change: |
6 | - `CFG` to where your config file (`conf`) will be; read rights required | 6 | - `CFG` to where your config file (`conf`) will be; read rights required |
7 | - `DAEMON` to point to the executable | 7 | - `DAEMON` to point to the executable |
8 | - `PIDFILE` to point to a pid file daemon would have rights to create | 8 | - `PIDFILE` to point to a pid file daemon would have rights to create |
9 | 9 | ||
10 | 2. Go over everything in `conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox-dht-bootstrap-server-daemon` | 10 | 2. Go over everything in `conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox_dht_bootstrap_server_daemon` |
11 | 11 | ||
12 | 3. Execute: | 12 | 3. Execute: |
13 | ``` | 13 | ``` |
14 | mv tox-dht-bootstrap-server-daemon /etc/init.d/tox-dht-bootstrap-server-daemon | 14 | mv tox_dht_bootstrap_server_daemon /etc/init.d/tox_dht_bootstrap_server_daemon |
15 | ``` | 15 | ``` |
16 | 16 | ||
17 | 4. Give the right permissions to this file: | 17 | 4. Give the right permissions to this file: |
18 | ``` | 18 | ``` |
19 | chmod 755 /etc/init.d/tox-dht-bootstrap-server-daemon | 19 | chmod 755 /etc/init.d/tox_dht_bootstrap_server_daemon |
20 | ``` | 20 | ``` |
21 | 21 | ||
22 | 5. Execute: | 22 | 5. Execute: |
23 | ``` | 23 | ``` |
24 | update-rc.d tox-dht-bootstrap-server-daemon defaults | 24 | update-rc.d tox_dht_bootstrap_server_daemon defaults |
25 | ``` | 25 | ``` |
26 | 26 | ||
27 | 6. Start the service: | 27 | 6. Start the service: |
28 | ``` | 28 | ``` |
29 | service tox-dht-bootstrap-server-daemon start | 29 | service tox_dht_bootstrap_server_daemon start |
30 | ``` | 30 | ``` |
31 | 31 | ||
32 | 7. Verify that the service is running: | 32 | 7. Verify that the service is running: |
33 | ``` | 33 | ``` |
34 | service tox-dht-bootstrap-server-daemon status | 34 | service tox_dht_bootstrap_server_daemon status |
35 | ``` | 35 | ``` |
36 | 36 | ||
37 | -- | 37 | -- |
38 | 38 | ||
39 | You can see daemon's log with | 39 | You can see daemon's log with |
40 | ``` | 40 | ``` |
41 | grep "tox-dht-bootstrap-server-daemon" /var/log/syslog | 41 | grep "tox_dht_bootstrap_server_daemon" /var/log/syslog |
42 | ``` | 42 | ``` |
43 | 43 | ||
44 | **Note that system log is where you find your public key** | 44 | **Note that system log is where you find your public key** |
@@ -49,12 +49,12 @@ grep "tox-dht-bootstrap-server-daemon" /var/log/syslog | |||
49 | 49 | ||
50 | 1. Check the log for errors with | 50 | 1. Check the log for errors with |
51 | ``` | 51 | ``` |
52 | grep "tox-dht-bootstrap-server-daemon" /var/log/syslog | 52 | grep "tox_dht_bootstrap_server_daemon" /var/log/syslog |
53 | ``` | 53 | ``` |
54 | 54 | ||
55 | 2. Check that paths in the beginning of `/etc/init.d/tox-dht-bootstrap-server-daemon` are valid | 55 | 2. Check that paths in the beginning of `/etc/init.d/tox_dht_bootstrap_server_daemon` are valid |
56 | 56 | ||
57 | 3. Make sure that `PIDFILE` from `/etc/init.d/tox-dht-bootstrap-server-daemon` matches with the `pid_file_path` from `conf` | 57 | 3. Make sure that `PIDFILE` from `/etc/init.d/tox_dht_bootstrap_server_daemon` matches with the `pid_file_path` from `conf` |
58 | 58 | ||
59 | 4. Make sure you have write premmision to keys and pid files | 59 | 4. Make sure you have write premmision to keys and pid files |
60 | 60 | ||
diff --git a/other/bootstrap_serverdaemon/conf b/other/bootstrap_serverdaemon/conf index b24e1e6c..a98f1a5c 100644 --- a/other/bootstrap_serverdaemon/conf +++ b/other/bootstrap_serverdaemon/conf | |||
@@ -7,14 +7,14 @@ port = 33445 | |||
7 | // The daemon should have premission to read/write to it | 7 | // The daemon should have premission to read/write to it |
8 | // Remember to replace the provided example with | 8 | // Remember to replace the provided example with |
9 | // your own path | 9 | // your own path |
10 | keys_file_path = "/home/tom/.tox-dht-bootstrap-server-daemon/keys" | 10 | keys_file_path = "/home/tom/.tox_dht_bootstrap_server_daemon/keys" |
11 | 11 | ||
12 | // The PID file written to by daemon, | 12 | // The PID file written to by daemon, |
13 | // make sure that the user who runs the server | 13 | // make sure that the user who runs the server |
14 | // does have permissions to write to it | 14 | // does have permissions to write to it |
15 | // Remember to replace the provided example with | 15 | // Remember to replace the provided example with |
16 | // your own path | 16 | // your own path |
17 | pid_file_path = "/home/tom/.tox-dht-bootstrap-server-daemon/pid" | 17 | pid_file_path = "/home/tom/.tox_dht_bootstrap_server_daemon/pid" |
18 | 18 | ||
19 | enable_ipv6 = false | 19 | enable_ipv6 = false |
20 | 20 | ||
diff --git a/other/bootstrap_serverdaemon/tox-dht-bootstrap-server-daemon b/other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon index 20639af8..678db5e3 100644 --- a/other/bootstrap_serverdaemon/tox-dht-bootstrap-server-daemon +++ b/other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon | |||
@@ -1,6 +1,6 @@ | |||
1 | #! /bin/sh | 1 | #! /bin/sh |
2 | ### BEGIN INIT INFO | 2 | ### BEGIN INIT INFO |
3 | # Provides: tox-dht-bootstrap-server-daemon | 3 | # Provides: tox_dht_bootstrap_server_daemon |
4 | # Required-Start: $remote_fs $syslog | 4 | # Required-Start: $remote_fs $syslog |
5 | # Required-Stop: $remote_fs $syslog | 5 | # Required-Stop: $remote_fs $syslog |
6 | # Default-Start: 2 3 4 5 | 6 | # Default-Start: 2 3 4 5 |
@@ -12,7 +12,7 @@ | |||
12 | # PATH should only include /usr/* if it runs after the mountnfs.sh script | 12 | # PATH should only include /usr/* if it runs after the mountnfs.sh script |
13 | PATH=/sbin:/usr/sbin:/bin:/usr/bin | 13 | PATH=/sbin:/usr/sbin:/bin:/usr/bin |
14 | DESC="ProjectTox bootstrap server daemon" | 14 | DESC="ProjectTox bootstrap server daemon" |
15 | NAME=tox-dht-bootstrap-server-daemon | 15 | NAME=tox_dht_bootstrap_server_daemon |
16 | USER=tom | 16 | USER=tom |
17 | CFG=/home/$USER/.$NAME/conf | 17 | CFG=/home/$USER/.$NAME/conf |
18 | DAEMON=/home/$USER/$NAME | 18 | DAEMON=/home/$USER/$NAME |
diff --git a/other/bootstrap_serverdaemon/tox-dht-bootstrap-server-daemon.c b/other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon.c index 9aa28533..25d3d9a0 100644 --- a/other/bootstrap_serverdaemon/tox-dht-bootstrap-server-daemon.c +++ b/other/bootstrap_serverdaemon/tox_dht_bootstrap_server_daemon.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* tox-dht-bootstrap-server-daemon | 1 | /* tox_dht_bootstrap_server_daemon |
2 | * | 2 | * |
3 | * A simple DHT boostrap server for tox - daemon edition. | 3 | * A simple DHT boostrap server for tox - daemon edition. |
4 | * | 4 | * |
@@ -42,13 +42,13 @@ | |||
42 | 42 | ||
43 | #include "../../testing/misc_tools.c" | 43 | #include "../../testing/misc_tools.c" |
44 | 44 | ||
45 | #define DAEMON_NAME "tox-dht-bootstrap-server-daemon" | 45 | #define DAEMON_NAME "tox_dht_bootstrap_server_daemon" |
46 | 46 | ||
47 | #define SLEEP_TIME_MILLISECONDS 30 | 47 | #define SLEEP_TIME_MILLISECONDS 30 |
48 | #define sleep usleep(1000*SLEEP_TIME_MILLISECONDS) | 48 | #define sleep usleep(1000*SLEEP_TIME_MILLISECONDS) |
49 | 49 | ||
50 | #define DEFAULT_PID_FILE_PATH ".tox-dht-bootstrap-server-daemon.pid" | 50 | #define DEFAULT_PID_FILE_PATH ".tox_dht_bootstrap_server_daemon.pid" |
51 | #define DEFAULT_KEYS_FILE_PATH ".tox-dht-bootstrap-server-daemon.keys" | 51 | #define DEFAULT_KEYS_FILE_PATH ".tox_dht_bootstrap_server_daemon.keys" |
52 | #define DEFAULT_PORT 33445 | 52 | #define DEFAULT_PORT 33445 |
53 | #define DEFAULT_ENABLE_IPV6 0 // 1 - true, 0 - false | 53 | #define DEFAULT_ENABLE_IPV6 0 // 1 - true, 0 - false |
54 | #define DEFAULT_ENABLE_LAN_DISCOVERY 1 // 1 - true, 0 - false | 54 | #define DEFAULT_ENABLE_LAN_DISCOVERY 1 // 1 - true, 0 - false |