Merge branch 'develop' into 'master'v4.2.0

DTail: Restrict SSH MAC algorithms allowed - Update of few dependencies

See merge request Storage/dtail!7

1 files changed, 9 insertions, 9 deletions

diff --git a/doc/installation.md b/doc/installation.md
index 0f6143b..a2c271a 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -53,18 +53,18 @@ uid=1001(dserver) 1001=670(dserver) groups=1001(dserver)
 % sudo chown -R dserver:dserver /var/run/dserver
 ```
 
-4. Install the ``dtail.json`` config to ``/etc/dserver/dtail.json``. An example can be found [here](../samples/dtail.json.sample).
+4. Install the ``dtail.json`` config to ``/etc/dserver/dtail.json``. An example can be found [here](../examples/dtail.json.example).
 
 ```console
 % sudo mkdir /etc/dserver
-% curl https://raw.githubusercontent.com/mimecast/dtail/master/samples/dtail.json.sample |
+% curl https://raw.githubusercontent.com/mimecast/dtail/master/examples/dtail.json.example |
     sudo tee /etc/dserver/dtail.json
 ```
 
-5. It is recommended to configure DTail server as a service to ``systemd``. An example unit file for ``systemd`` can be found [here](../samples/dserver.service.sample).
+5. It is recommended to configure DTail server as a service to ``systemd``. An example unit file for ``systemd`` can be found [here](../examples/dserver.service.example).
 
 ```console
-% curl https://raw.githubusercontent.com/mimecast/dtail/master/samples/dserver.service.sample |
+% curl https://raw.githubusercontent.com/mimecast/dtail/master/examples/dserver.service.example |
     sudo tee /etc/systemd/system/dserver.service
 % sudo systemctl daemon-reload
 % sudo systemctl enable dserver
@@ -97,15 +97,15 @@ To start the DTail server via ``systemd`` run:
 
 The DTail server now runs as a ``systemd`` service under system user ``dserver``. However, the system user ``dserver`` has no permissions to read the SSH public keys from ``/home/USER/.ssh/authorized_keys``. Therefore, no user would be able to establish an SSH session to DTail server. As an alternative path DTail server also checks for public SSH key files in ``/var/run/dserver/cache/USER.authorized_keys``.
 
-It is recommended to execute [update_key_cache.sh](../samples/update_key_cache.sh.sample) periodically to update the key cache. In case you manage your public SSH keys via Puppet you could subscribe the script to corresponding module. Or alternatively just configure a cron job or a systemd timer to run every once in a while, e.g. every 30 minutes:
+It is recommended to execute [update_key_cache.sh](../examples/update_key_cache.sh.example) periodically to update the key cache. In case you manage your public SSH keys via Puppet you could subscribe the script to corresponding module. Or alternatively just configure a cron job or a systemd timer to run every once in a while, e.g. every 30 minutes:
 
 ```console
-% curl https://raw.githubusercontent.com/mimecast/dtail/master/samples/update_key_cache.sh.sample |
+% curl https://raw.githubusercontent.com/mimecast/dtail/master/examples/update_key_cache.sh.example |
     sudo tee /var/run/dserver/update_key_cache.sh
 % sudo chmod 755 /var/run/dserver/update_key_cache.sh
-% curl https://raw.githubusercontent.com/mimecast/dtail/master/samples/dserver-update-keycache.service.sample |
+% curl https://raw.githubusercontent.com/mimecast/dtail/master/examples/dserver-update-keycache.service.example |
     sudo tee /etc/systemd/system/dserver-update-keycache.service
-% curl https://raw.githubusercontent.com/mimecast/dtail/master/samples/dserver-update-keycache.timer.sample |
+% curl https://raw.githubusercontent.com/mimecast/dtail/master/examples/dserver-update-keycache.timer.example |
     sudo tee /etc/systemd/system/dserver-update-keycache.timer
 % sudo systemctl daemon-reload
 % sudo systemctl start dserver-update-keycache.service
@@ -119,7 +119,7 @@ Now you should be able to use DTail client like outlined in the [Quick Starting
 
 # Monitor it
 
-To verify that DTail server is up and running and functioning as expected, you should configure the Nagios check [check_dserver.sh](../samples/check_dserver.sh.sample) in your monitoring system. The check has to be executed locally on the server (e.g. via NRPE). How to configure the monitoring system in detail is out of scope of this guide.
+To verify that DTail server is up and running and functioning as expected, you should configure the Nagios check [check_dserver.sh](../examples/check_dserver.sh.example) in your monitoring system. The check has to be executed locally on the server (e.g. via NRPE). How to configure the monitoring system in detail is out of scope of this guide.
 
 ```console
 % ./check_dserver.sh