From 13cb4357de5134201af1d760b3d9c7cf3bd42554 Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:23:57 -0700 Subject: [PATCH 01/22] Update www_default.html --- conf/www_default.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/conf/www_default.html b/conf/www_default.html index edefc428..51474b47 100644 --- a/conf/www_default.html +++ b/conf/www_default.html @@ -1,9 +1,4 @@ - - this is a mail-in-a-box - -

this is a mail-in-a-box

-

take control of your email at https://mailinabox.email/

From f8bf686b4bae9dcf9ef6d128935b91a76e870ca7 Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:25:40 -0700 Subject: [PATCH 02/22] Update mail-postfix.sh --- setup/mail-postfix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/mail-postfix.sh b/setup/mail-postfix.sh index d62478e1..0e7c6112 100755 --- a/setup/mail-postfix.sh +++ b/setup/mail-postfix.sh @@ -66,7 +66,7 @@ tools/editconf.py /etc/postfix/main.cf \ smtp_bind_address=$PRIVATE_IP \ smtp_bind_address6=$PRIVATE_IPV6 \ myhostname=$PRIMARY_HOSTNAME\ - smtpd_banner="\$myhostname ESMTP Hi, I'm a Mail-in-a-Box (Ubuntu/Postfix; see https://mailinabox.email/)" \ + smtpd_banner="\$myhostname ESMTP" \ mydestination=localhost # Tweak some queue settings: From 19b08c61d2ea8afcb4ba3abe50b52b994961cfed Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:27:37 -0700 Subject: [PATCH 03/22] Update index.html --- management/templates/index.html | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/management/templates/index.html b/management/templates/index.html index 09684774..9d9b6e19 100644 --- a/management/templates/index.html +++ b/management/templates/index.html @@ -5,7 +5,7 @@ - {{hostname}} - Mail-in-a-Box Control Panel + {{hostname}} @@ -63,7 +63,6 @@ margin-bottom: 1em; } - @@ -158,12 +157,6 @@
{% include "ssl.html" %}
- -
- - -
- {% include "sync-guide.html" %} -
-
{% include "web.html" %}
From 7b065f28116260b1cbd74f2fa6ff8ffdfe78a607 Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 17:57:24 -0700 Subject: [PATCH 21/22] Update mail-guide.html --- management/templates/mail-guide.html | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/management/templates/mail-guide.html b/management/templates/mail-guide.html index 906e7b2a..8769e6c5 100644 --- a/management/templates/mail-guide.html +++ b/management/templates/mail-guide.html @@ -14,10 +14,6 @@

Mobile/desktop apps

-

Automatic configuration

- -

iOS and OS X only: Open this configuration link on your iOS device or on your Mac desktop to easily set up mail (IMAP/SMTP), Contacts, and Calendar. Your username is your whole email address.

-

Manual configuration

Use the following settings when you set up your email on your phone, desktop, or other device:

@@ -39,17 +35,6 @@

In addition to setting up your email, you’ll also need to set up contacts and calendar synchronization separately.

As an alternative to IMAP you can also use the POP protocol: choose POP as the protocol, port 995, and SSL or TLS security in your mail client. The SMTP settings and usernames and passwords remain the same. However, we recommend you use IMAP instead.

- -

Exchange/ActiveSync settings

- -

On iOS devices, devices on this compatibility list, or using Outlook 2007 or later on Windows 7 and later, you may set up your mail as an Exchange or ActiveSync server. However, we’ve found this to be more buggy than using IMAP as described above. If you encounter any problems, please use the manual settings above.

- - - - -
Server {{hostname}}
Options Secure Connection
- -

Your device should also provide a contacts list and calendar that syncs to this box when you use this method.

From e555ed7f03314e39e1515fb5c1b322750d2c5903 Mon Sep 17 00:00:00 2001 From: Josh Harmon Date: Sun, 24 Jul 2016 18:00:31 -0700 Subject: [PATCH 22/22] Update index.html --- management/templates/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/management/templates/index.html b/management/templates/index.html index 3bf366a4..6ad63a03 100644 --- a/management/templates/index.html +++ b/management/templates/index.html @@ -103,7 +103,6 @@
  • Aliases
    • -
  • Contacts/Calendar
  • Web