From c011eff7d5385665f43db2e0330716da4ab68e75 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Tue, 29 Jan 2019 14:55:22 +0100
Subject: [PATCH] Update PostfixAdmin docs

---
 postfixadmin/content.md            | 22 ++++------------------
 postfixadmin/stack.yml             |  2 +-
 postfixadmin/variant-apache.md     |  3 +++
 postfixadmin/variant-fpm-alpine.md |  3 +++
 postfixadmin/variant-fpm.md        |  3 +++
 5 files changed, 14 insertions(+), 19 deletions(-)
 create mode 100644 postfixadmin/variant-apache.md
 create mode 100644 postfixadmin/variant-fpm-alpine.md
 create mode 100644 postfixadmin/variant-fpm.md

diff --git a/postfixadmin/content.md b/postfixadmin/content.md
index 910bc4bdc..883d589a8 100644
--- a/postfixadmin/content.md
+++ b/postfixadmin/content.md
@@ -48,26 +48,12 @@ Then, access it via `http://localhost:8080` or `http://host-ip:8080` in a browse
 ## Existing config.local.php
 
 ```console
-$ docker run --name some-%%REPO%% -p 8080:80 %%image%%
-$ docker run --name some-%%REPO%% -v /local/path/to/config.local.php:/var/www/html/config.local.php -p 8080:80 %%IMAGE%%
+$ docker run -v /local/path/to/config.local.php:/var/www/html/config.local.php \
+           --name some-%%REPO%% \
+           -p 8080:80 \
+        %%IMAGE%%
 ```
 
-## Image Variants
-
-The following variants are currently provided:
-
-### apache
-
-This starts an Apache webserver with PHP, so you can use `postfixadmin` out of the box.
-
-### fpm-alpine
-
-This image has a very small footprint. It is based on Alpine Linux and starts only a PHP FPM process. Use this variant if you already have a seperate webserver. If you need more tools, that are not available on Alpine Linux, use the `fpm` image instead.
-
-### fpm
-
-This image starts only a PHP FPM container. Use this variant if you already have a seperate webserver.
-
 %%STACK%%
 
 Run docker stack deploy -c stack.yml %%REPO%% (or docker-compose -f stack.yml up), wait for it to initialize completely, and visit http://swarm-ip:8080, http://localhost:8080, or http://host-ip:8080 (as appropriate).
diff --git a/postfixadmin/stack.yml b/postfixadmin/stack.yml
index d3cd8ec3a..b40e6c5b1 100644
--- a/postfixadmin/stack.yml
+++ b/postfixadmin/stack.yml
@@ -5,7 +5,7 @@ services:
     image: mysql:5.7
     restart: always
     environment:
-      MYSQL_ROOT_PASSWORD: notSecureChangeMe
+      MYSQL_RANDOM_ROOT_PASSWORD: 1
       MYSQL_DATABASE: postfixadmin
       MYSQL_USER: postfixadmin
       MYSQL_PASSWORD: example
diff --git a/postfixadmin/variant-apache.md b/postfixadmin/variant-apache.md
new file mode 100644
index 000000000..b9666ea37
--- /dev/null
+++ b/postfixadmin/variant-apache.md
@@ -0,0 +1,3 @@
+### apache
+
+This starts an Apache webserver with PHP, so you can use `postfixadmin` out of the box.
diff --git a/postfixadmin/variant-fpm-alpine.md b/postfixadmin/variant-fpm-alpine.md
new file mode 100644
index 000000000..1aaa0208a
--- /dev/null
+++ b/postfixadmin/variant-fpm-alpine.md
@@ -0,0 +1,3 @@
+### fpm-alpine
+
+This image has a very small footprint. It is based on Alpine Linux and starts only a PHP FPM process. Use this variant if you already have a seperate webserver. If you need more tools, that are not available on Alpine Linux, use the `fpm` image instead.
diff --git a/postfixadmin/variant-fpm.md b/postfixadmin/variant-fpm.md
new file mode 100644
index 000000000..621d254ff
--- /dev/null
+++ b/postfixadmin/variant-fpm.md
@@ -0,0 +1,3 @@
+### fpm
+
+This image starts only a PHP FPM container. Use this variant if you already have a seperate webserver.