Update systemd files to not mention config.json file (minio#14)

Author: nitisht

linux-systemd/README.md

@@ -7,26 +7,18 @@ Systemd script for Minio server.
 - Systemd script is configured to run the binary from /usr/local/bin/.
 - Download the binary. Find the relevant links for the binary at https://minio.io/downloads/#minio-server.
 
-## Create default configuration.
+## Create default configuration
 
-Don't forget to update MINIO_VOLUMES with the correct path.
-```
-cat <<EOT >> /etc/default/minio
-# Local export path.
+This file serves as input to Minio systemd service. Use this file to add `MINIO_VOLUMES` with the correct paths,
+`MINIO_OPTS` to add Minio server options like `config-dir`, `address`. Minio credentials can be
+`MINIO_ACCESS_KEY` and `MINIO_SECRET_KEY` in this file as well.
+
+```sh
+$ cat <<EOT >> /etc/default/minio
+# Volume to be used for Minio server.
 MINIO_VOLUMES="/tmp/minio/"
 # Use if you want to run Minio on a custom port.
 MINIO_OPTS="--address :9199"
-
-EOT
-```
-
-## Override default keys.
-
-By default minio reads credentials from `${HOME}/.minio/config.json`. You can
-override these values by adding custom credentials in `/etc/default/minio`.
-
-```
-cat <<EOT >> /etc/default/minio
 # Access Key of the server.
 MINIO_ACCESS_KEY=Server-Access-Key
 # Secret key of the server.

linux-systemd/distributed/README.md

@@ -7,28 +7,18 @@ Systemd script for Distributed Minio server.
 - Systemd script is configured to run the binary from /usr/local/bin/.
 - Download the binary. Find the relevant links for the binary at https://minio.io/downloads/#minio-server.
 
-## Create the Environment configuration file.
+## Create the Environment configuration file
 
-Don't forget to update MINIO_VOLUMES with the correct paths.
+This file serves as input to Minio systemd service. Use this file to add `MINIO_VOLUMES` with the correct paths,
+`MINIO_OPTS` to add Minio server options like `config-dir`, `address`. Minio credentials should be
+`MINIO_ACCESS_KEY` and `MINIO_SECRET_KEY` in this file as well.
 
 ```sh
 $ cat <<EOT >> /etc/default/minio
-# Remote node configuration.
+# Remote volumes to be used for Minio server.
 MINIO_VOLUMES=http://node1/export1 http://node2/export2 http://node3/export3 http://node4/export4
 # Use if you want to run Minio on a custom port.
 MINIO_OPTS="--address :9199"
-
-EOT
-```
-
-## Override default keys.
-
-By default minio reads credentials from `${HOME}/.minio/config.json`. For
-distriuted setup it is required to copy this file across all nodes to have
-consistent credentials. You can override this behavior add custom credentials
-in `/etc/default/minio`.
-```
-cat <<EOT >> /etc/default/minio
 # Access Key of the server.
 MINIO_ACCESS_KEY=Server-Access-Key
 # Secret key of the server.
@@ -37,15 +27,18 @@ MINIO_SECRET_KEY=Server-Secret-Key
 EOT
 ```
 
+For distributed setup it is required to copy this file across all nodes to have consistent credentials.
+
 ## Systemctl
 
 Download `minio.service` in  `/etc/systemd/system/`
+
 ```
 ( cd /etc/systemd/system/; curl -O https://raw.githubusercontent.com/minio/minio-service/master/linux-systemd/distributed/minio.service )
 ```
 
 Enable startup on boot
+
 ```
 systemctl enable minio.service
 ```
-

linux-systemd/distributed/minio.service

@@ -14,7 +14,9 @@ Group=minio-user
 PermissionsStartOnly=true
 
 EnvironmentFile=-/etc/default/minio
-ExecStartPre=/bin/bash -c "[ -n \"${MINIO_VOLUMES}\" ] || echo \"Variable MINIO_VOLUMES not set in /etc/defaults/minio\""
+ExecStartPre=/bin/bash -c "[ -n \"${MINIO_VOLUMES}\" ] && echo \"Variable MINIO_VOLUMES not set in /etc/default/minio\""
+ExecStartPre=/bin/bash -c "[ -n \"${MINIO_ACCESS_KEY}\" ] && echo \"Variable MINIO_ACCESS_KEY not set in /etc/default/minio\""
+ExecStartPre=/bin/bash -c "[ -n \"${MINIO_SECRET_KEY}\" ] && echo \"Variable MINIO_SECRET_KEY not set in /etc/default/minio\""
 
 ExecStart=/usr/local/bin/minio server $MINIO_OPTS $MINIO_VOLUMES
 

linux-systemd/minio.service

@@ -14,7 +14,7 @@ Group=minio-user
 PermissionsStartOnly=true
 
 EnvironmentFile=-/etc/default/minio
-ExecStartPre=/bin/bash -c "[ -n \"${MINIO_VOLUMES}\" ] || echo \"Variable MINIO_VOLUMES not set in /etc/default/minio\""
+ExecStartPre=/bin/bash -c "[ -n \"${MINIO_VOLUMES}\" ] && echo \"Variable MINIO_VOLUMES not set in /etc/default/minio\""
 
 ExecStart=/usr/local/bin/minio server $MINIO_OPTS $MINIO_VOLUMES