From 392637e16acd0db0eb73e7943f5c6517ad3ead72 Mon Sep 17 00:00:00 2001
From: Dario Ernst
Date: Fri, 25 Jan 2019 20:08:05 +0100
Subject: [PATCH] Correct the URL users are directed to after using setup
without exposing /admin
closes #885
---
setup/.env | 2 +-
setup/docker-compose.yml | 2 +-
setup/flavors/compose/setup.html | 9 +++++++--
setup/flavors/stack/setup.html | 11 ++++++++---
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/setup/.env b/setup/.env
index 2c1113ce..676b07fd 100644
--- a/setup/.env
+++ b/setup/.env
@@ -1,5 +1,5 @@
# Hostname passed to Traefik
-ADDRESS=setup.mailu.io
+ADDRESS=test02.usrpro.io
# Current release
RELEASE=master
diff --git a/setup/docker-compose.yml b/setup/docker-compose.yml
index 9c93fd6f..b7b4b05f 100644
--- a/setup/docker-compose.yml
+++ b/setup/docker-compose.yml
@@ -13,4 +13,4 @@ services:
depends_on:
- redis
ports:
- - 127.0.0.1:8001:80
+ - 0.0.0.0:80:80
diff --git a/setup/flavors/compose/setup.html b/setup/flavors/compose/setup.html
index 46369577..1c372143 100644
--- a/setup/flavors/compose/setup.html
+++ b/setup/flavors/compose/setup.html
@@ -44,8 +44,13 @@ Before you can use Mailu, you must create the primary administrator user account
one of the hostnames
{{ hostnames.split(',')[0] }}{{ admin_path }}.
{% else %}
-http://127.0.0.1:8080 (only directly from the host running docker).
+http://127.0.0.1:8080/ui (only directly from the host running docker).
+If you run mailu on a remote server, and wish to access the admin interface via a SSH tunnel, you can create a port-forward from your local machine to your server like
+ssh -L 127.0.0.1:8080:127.0.0.1:8080 <user>@<server>
+
+And access the above URL from your local machine.
+
{% endif %}
-And choose the "Update password" option in the left menu.
+Also, choose the "Update password" option in the left menu.
{% endcall %}
diff --git a/setup/flavors/stack/setup.html b/setup/flavors/stack/setup.html
index 81470b5b..9a243ccb 100644
--- a/setup/flavors/stack/setup.html
+++ b/setup/flavors/stack/setup.html
@@ -50,11 +50,16 @@ Before you can use Mailu, you must create the primary administrator user account
Login to the admin interface to change the password for a safe one, at
{% if admin_enabled %}
-one of the hostnames
+one of the hostnames
{{ hostnames.split(',')[0] }}{{ admin_path }}.
{% else %}
-http://127.0.0.1:8080 (only directly from the host running docker).
+http://127.0.0.1:8080/ui (only directly from the host running docker).
+If you run mailu on a remote server, and wish to access the admin interface via a SSH tunnel, you can create a port-forward from your local machine to your server like
+
ssh -L 127.0.0.1:8080:127.0.0.1:8080 <user>@<server>
+
+And access the above URL from your local machine.
+
{% endif %}
-And choose the "Update password" option in the left menu.
+Also, choose the "Update password" option in the left menu.
{% endcall %}