From 6a907eef26294ea8e5086f22f0e0a3390b125dad Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <Zhang Huangbin@localhost>
Date: Fri, 3 Jul 2015 23:21:20 +0800
Subject: [PATCH] Sync file location of iRedAdmin config file on Debian/Ubuntu.

---
 faq/file.locations.md    | 4 +++-
 html/file.locations.html | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/faq/file.locations.md b/faq/file.locations.md
index 4428136b..badcb8c7 100644
--- a/faq/file.locations.md
+++ b/faq/file.locations.md
@@ -199,7 +199,9 @@ Main config file is `/opt/iredapd/settings.py` on all Linux/BSD distributions.
 Main config file:
 
 * on RHEL/CentOS, it's `/var/www/iredadmin/settings.py`.
-* on Debian/Ubuntu, it's `/usr/share/apache2/iredadmin/settings.py`.
+* on Debian/Ubuntu, it's `/opt/www/iredadmin/settings.py` (in recent iRedMail
+  releases) or `/usr/share/apache2/iredadmin/settings.py` (in old iRedMail
+  releases).
 * on FreeBSD, it's `/usr/local/www/iredadmin/settings.py`.
 * on OpenBSD, it's `/var/www/iredadmin/settings.py`.
 
diff --git a/html/file.locations.html b/html/file.locations.html
index 4b225767..979be383 100644
--- a/html/file.locations.html
+++ b/html/file.locations.html
@@ -241,7 +241,9 @@ releases), it has two separate config files: <code>config/db.inc.php</code> and
 <p>Main config file:</p>
 <ul>
 <li>on RHEL/CentOS, it's <code>/var/www/iredadmin/settings.py</code>.</li>
-<li>on Debian/Ubuntu, it's <code>/usr/share/apache2/iredadmin/settings.py</code>.</li>
+<li>on Debian/Ubuntu, it's <code>/opt/www/iredadmin/settings.py</code> (in recent iRedMail
+  releases) or <code>/usr/share/apache2/iredadmin/settings.py</code> (in old iRedMail
+  releases).</li>
 <li>on FreeBSD, it's <code>/usr/local/www/iredadmin/settings.py</code>.</li>
 <li>on OpenBSD, it's <code>/var/www/iredadmin/settings.py</code>.</li>
 </ul>