3 files changed, 85 insertions, 57 deletions

diff --git a/other/bootstrap_daemon/README.md b/other/bootstrap_daemon/README.md
index 9a2dff4b..d0c16eb1 100644
--- a/other/bootstrap_daemon/README.md
+++ b/other/bootstrap_daemon/README.md
@@ -1,29 +1,32 @@
-##Instructions for Debian
+##Instructions 
+
+This instruction primarily tested on Linux but, may be, will work on other POSIX-compliant systems.
 
 For security reasons we run the daemon under its own user.
+
 Create a new user by executing the following:
 ```sh
-sudo useradd --system --shell /sbin/nologin --comment "Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
+sudo useradd --home-dir /var/lib/tox-bootstrapd --create-home --system --shell /sbin/nologin --comment "Account to run Tox's DHT bootstrap daemon" --user-group tox-bootstrapd
 ```
 
-Create a directory where the daemon will store its keys:
-```sh
-sudo mkdir /var/lib/tox-bootstrapd/
-```
+Copy `tox-bootstrapd.conf` file to where `CFGFILE` variable from `tox-bootstrapd.sh` tells (for `init.d` users) or `ExecStart=` from `tox-bootstrap.service` ( for `systemd` users). By default it's `/etc/tox-bootstrapd.conf`.
+
+Go over everything in `tox-bootstrapd.conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox-bootstrapd.sh` (`init.d`) or `PIDFile=` from `tox-bootstrap.service` AND file in `ExecStartPre`(`systemd`).
+
 
-Restrain other users from accessing the directory:
+Restrict access to home directory:
 ```sh
-sudo chown tox-bootstrapd:tox-bootstrapd /var/lib/tox-bootstrapd/
-sudo chmod 700 /var/lib/tox-bootstrapd/
+sudo chmod 700 /var/lib/tox-bootstrapd
 ```
 
-Look at the variable declarations in the beginning of `tox-bootstrapd.sh` init script to see if you need to change anything for it to work for you. The default values must be fine for most users and we assume that you use those next.
-
-Go over everything in `tox-bootstrapd.conf`. Make sure `pid_file_path` matches `PIDFILE` from `tox-bootstrapd.sh`.
+##For `init.d` users:
 
-Place `tox-bootstrapd.conf` file to where `CFGFILE` variable from `tox-bootstrapd.sh` tells. By default it's `/etc/tox-bootstrapd.conf`.
+Look at the variable declarations in the beginning of `tox-bootstrapd.sh` init script to see if you need to change anything for it to work for you. The default values must be fine for most users and we assume that you use those next.
 
-Place `tox-bootstrapd.sh` init file at `/etc/init.d/tox-bootstrapd` (note the disappearance of ".sh" ending).
+Copy `tox-bootstrapd.sh` init file to `/etc/init.d/tox-bootstrapd` (note the disappearance of ".sh" ending).
+```sh
+sudo cp tox-bootstrapd.sh /etc/init.d/tox-bootstrapd
+```
 
 Set permissions for the init system to run the script:
 ```sh
@@ -50,23 +53,56 @@ Get your public key and check that the daemon initialized correctly:
 sudo grep "tox-bootstrapd" /var/log/syslog
 ```
 
+##For `systemd` users:
+
+Copy tox-bootstrap.service to /etc/systemd/system/:
+```sh
+sudo cp tox-bootstrap.service /etc/systemd/system/
+```
+
+Make sure, that path to `chown` and `mkdir` is correct in `tox-bootstrap.service` (they may be different in some distributions, by default  `/bin/chown` and `/bin/mkdir`) 
+
+You must uncomment the next line in tox-bootstrap.service, if you want to use port number <1024 
+        
+        #CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+
+and, possibly, install `libcap2-bin` or `libcap2` package, depending of your distribution.
+
 
+Reload systemd units definitions, enable service for automatic start (if needed), and start it: 
+```sh
+sudo systemctl daemon-reload
+sudo systemctl enable tox-bootstrap.service
+sudo systemctl start tox-bootstrap.service
+```
 ###Troubleshooting:
 
 - Check daemon's status:
 ```sh
+#init.d
 sudo service tox-bootstrapd status
+
+#systemd
+sudo systemctl status tox-bootstrap.service 
 ```
 
 - Check the log for errors: 
 ```sh
+#init.d
 sudo grep "tox-bootstrapd" /var/log/syslog
+
+#systemd
+sudo journalctl -f _SYSTEMD_UNIT=tox-bootstrap.service
 ```
 
+`init.d`:
 - Check that variables in the beginning of `/etc/init.d/tox-bootstrapd` are valid.
 
-- Make sure `pid_file_path` in `/etc/tox-bootstrapd.conf` matches `PIDFILE` from  `/etc/init.d/tox-bootstrapd`.
 
-- Make sure you have write permission for keys and pid files.
+Common:
+
+- Make sure tox-bootstrapd user has write permission for keys and pid files (in systemd pid file insured by unit definition).
+
+- Make sure tox-bootstrapd has read permission for the config file.
 
-- Make sure you have read permission for the config file.
+- Make sure tox-bootstrapd location matches its path in init scripts, if you specified non-default `--prefix`, when building. 
diff --git a/other/bootstrap_daemon/tox-bootstrapd.conf b/other/bootstrap_daemon/tox-bootstrapd.conf
index 4547d83d..d02eb3d0 100644
--- a/other/bootstrap_daemon/tox-bootstrapd.conf
+++ b/other/bootstrap_daemon/tox-bootstrapd.conf
@@ -24,8 +24,8 @@ enable_lan_discovery = true
 
 enable_tcp_relay = true
 
-// Tox uses 443, 3389 and 33445 ports by default, so it's highly encouraged to keep
-// them.
+// While Tox uses 33445 port by default, 443 (https) and 3389 (rdp) ports are very
+// common among nodes, so it's encouraged to keep them in place.
 tcp_relay_ports = [443, 3389, 33445]
 
 // Reply to MOTD (Message Of The Day) requests.
@@ -45,48 +45,21 @@ motd = "tox-bootstrapd"
 // in both cases this will be interpreted as if you don't want to bootstrap
 // from anyone.
 //
-// address = any ipv4 or ipv6 address and also any US-ASCII domain name.
+// address = any IPv4 or IPv6 address and also any US-ASCII domain name.
 bootstrap_nodes = (
-  {   
-    // NikolaiToryzin - US
-    address = "192.254.75.98"
+  { // Example Node 1 (IPv4)
+    address = "127.0.0.1"
     port = 33445
-    public_key = "951C88B7E75C867418ACDB5D273821372BB5BD652740BCDF623A4FA293E75D2F"
+    public_key = "728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854"
   },
-  { 
-    // Proplex - US
-    address = "107.161.17.51"
+  { // Example Node 2 (IPv6)
+    address = "::1/128"
     port = 33445
-    public_key = "7BE3951B97CA4B9ECDDA768E8C52BA19E9E2690AB584787BF4C90E04DBB75111"
+    public_key = "3E78BACF0F84235B30054B54898F56793E1DEF8BD46B1038B9D822E8460FAB67"
   },
-  { 
-    // SonOfRa - DE
-    address = "144.76.60.215"
+  { // Example Node 3 (US-ASCII domain name)
+    address = "example.org"
     port = 33445
-    public_key = "04119E835DF3E78BACF0F84235B300546AF8B936F035185E2A8E9E0A67C8924F"
-  },
-  { 
-    // Astonex - FR
-    address = "37.59.102.176"
-    port = 33445
-    public_key = "B98A2CEAA6C6A2FADC2C3632D284318B60FE5375CCB41EFA081AB67F500C1B0B"
-  },
-  { 
-    // SylvieLorxu - NL
-    address = "178.21.112.187"
-    port = 33445
-    public_key = "4B2C19E924972CB9B57732FB172F8A8604DE13EEDA2A6234E348983344B23057"
-  },
-  { 
-    // aitjcize  - JP
-    address = "54.199.139.199"
-    port = 33445
-    public_key = "7F9C31FE850E97CEFD4C4591DF93FC757C7C12549DDD55F8EEAECC34FE76C029"
-  },
-  { 
-    // NikolaiToryzin - CH
-    address = "31.7.57.236"
-    port = 443
-    public_key = "2A4B50D1D525DA2E669592A20C327B5FAD6C7E5962DC69296F9FEC77C4436E4E"
+    public_key = "8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858"
   }
-)
+)
\ No newline at end of file
diff --git a/other/bootstrap_daemon/tox-bootstrapd.service b/other/bootstrap_daemon/tox-bootstrapd.service
new file mode 100644
index 00000000..4b499311
--- /dev/null
+++ b/other/bootstrap_daemon/tox-bootstrapd.service
@@ -0,0 +1,19 @@
+[Unit]
+Description=Tox DHT Bootstrap Daemon
+After=network.target
+
+[Service]
+Type=forking
+PermissionsStartOnly=true
+ExecStartPre=-/bin/mkdir /var/run/tox-bootstrapd -p
+ExecStartPre=/bin/chown tox-bootstrapd:tox-bootstrapd -R /var/run/tox-bootstrapd
+WorkingDirectory=/var/lib/tox-bootstrapd
+ExecStart=/usr/local/bin/tox-bootstrapd /etc/tox-bootstrapd.conf
+User=tox-bootstrapd
+Group=tox-bootstrapd
+PIDFile=/var/run/tox-bootstrapd/tox-bootstrapd.pid
+#CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+
+[Install]
+WantedBy=multi-user.target
+