From 3ac9577aa38ce80cc16244dc91fb1241e677c0f5 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin
Date: Tue, 10 Mar 2020 09:58:14 +0800
Subject: [PATCH] Mention /opt/iredmail/custom/nginx/webapps/.
---
.../2-iredmail-easy.best.practice.md | 18 +++++++++++++++--
html/iredmail-easy.best.practice.html | 20 +++++++++++++++++--
2 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/en_US/iredmail-easy/2-iredmail-easy.best.practice.md b/en_US/iredmail-easy/2-iredmail-easy.best.practice.md
index ba361ccd..f94e96da 100644
--- a/en_US/iredmail-easy/2-iredmail-easy.best.practice.md
+++ b/en_US/iredmail-easy/2-iredmail-easy.best.practice.md
@@ -238,15 +238,28 @@ index attr_4,attr_5,attr_6 eq,pres
command in this file (`custom.sh`) to remove existing config file
generated by iRedMail Easy and store custom settings in another file.
-- `/opt/iredmail/custom/nginx/conf-enabled/`: additional Nginx global settings used inside `http {}` block.
+- `/opt/iredmail/custom/nginx/conf-enabled/`: additional Nginx global settings
+ used inside `http {}` block.
+
- If you want to override a parameter which is already defined in
`/etc/nginx/conf-enabled/`, please update `/opt/iredmail/custom/nginx/custom.sh`
to remove file under `/etc/nginx/conf-enabled/` first, then write your
own config file under `/opt/iredmail/custom/nginx/conf-enabled/` to set
a proper value.
-- `/opt/iredmail/custom/nginx/sites-conf.d/default-ssl/`: additional settings for default https website (inside the `server {}` block).
+- `/opt/iredmail/custom/nginx/sites-conf.d/default-ssl/`: additional settings
+ for default https website (inside the `server {}` block).
- `/opt/iredmail/custom/nginx/sites-enabled/`: additional virtual web hosts.
+- `/opt/iredmail/custom/nginx/webapps/`: additional settings for certain web
+ applications, usually used to add ACL for the web applications. Including:
+
+ - `adminer.conf`: loaded in file `/etc/nginx/template/adminer.tmpl`.
+ - `iredadmin.conf`: loaded in file `/etc/nginx/template/iredadmin.tmpl`.
+ - `netdata.conf`: loaded in file `/etc/nginx/template/netdata.tmpl`.
+ - `roundcube.conf`: it will be loaded in file `/etc/nginx/templates/roundcube*.tmpl`.
+ - `sogo.conf`: loaded in file `/etc/nginx/template/sogo.tmpl`.
+ - `php_fpm_status.conf`: loaded in file `/etc/nginx/template/php_fpm_status.tmpl`.
+ - `stub_status.conf`: loaded in file `/etc/nginx/template/stub_status.tmpl`.
iRedMail uses the directory structure recommended by Debian/Ubuntu:
@@ -278,6 +291,7 @@ iRedMail uses the directory structure recommended by Debian/Ubuntu:
|- conf-enabled/
|- sites-available/
|- sites-enabled/
+ |- webapps/ # config snippets for certain web applications.
|- custom.sh # shell script used for advanced customization
```
diff --git a/html/iredmail-easy.best.practice.html b/html/iredmail-easy.best.practice.html
index cc8f83b3..428a20f5 100644
--- a/html/iredmail-easy.best.practice.html
+++ b/html/iredmail-easy.best.practice.html
@@ -362,7 +362,8 @@ index attr_4,attr_5,attr_6 eq,pres
generated by iRedMail Easy and store custom settings in another file.
-/opt/iredmail/custom/nginx/conf-enabled/
: additional Nginx global settings used inside http {}
block.
+/opt/iredmail/custom/nginx/conf-enabled/
: additional Nginx global settings
+ used inside http {}
block.
- If you want to override a parameter which is already defined in
/etc/nginx/conf-enabled/
, please update /opt/iredmail/custom/nginx/custom.sh
@@ -372,9 +373,23 @@ index attr_4,attr_5,attr_6 eq,pres
-/opt/iredmail/custom/nginx/sites-conf.d/default-ssl/
: additional settings for default https website (inside the server {}
block).
+/opt/iredmail/custom/nginx/sites-conf.d/default-ssl/
: additional settings
+ for default https website (inside the server {}
block).
/opt/iredmail/custom/nginx/sites-enabled/
: additional virtual web hosts.
+
+/opt/iredmail/custom/nginx/webapps/
: additional settings for certain web
+ applications, usually used to add ACL for the web applications. Including:
+
+adminer.conf
: loaded in file /etc/nginx/template/adminer.tmpl
.
+iredadmin.conf
: loaded in file /etc/nginx/template/iredadmin.tmpl
.
+netdata.conf
: loaded in file /etc/nginx/template/netdata.tmpl
.
+roundcube.conf
: it will be loaded in file /etc/nginx/templates/roundcube*.tmpl
.
+sogo.conf
: loaded in file /etc/nginx/template/sogo.tmpl
.
+php_fpm_status.conf
: loaded in file /etc/nginx/template/php_fpm_status.tmpl
.
+stub_status.conf
: loaded in file /etc/nginx/template/stub_status.tmpl
.
+
+
iRedMail uses the directory structure recommended by Debian/Ubuntu:
/etc/nginx/ # all config files
@@ -404,6 +419,7 @@ index attr_4,attr_5,attr_6 eq,pres
|- conf-enabled/
|- sites-available/
|- sites-enabled/
+ |- webapps/ # config snippets for certain web applications.
|- custom.sh # shell script used for advanced customization