beenull/power-mailinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

new nginx configuration yaml file to allow proxying of whole domains elsewhere

Browse source
This commit is contained in:
Joshua Tauberer 2014-07-09 12:31:32 +00:00
parent 04e30ffa78
commit 1a74b81f44
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
conf/nginx.conf
View file

@ -52,5 +52,7 @@ server {
fastcgi_param SCRIPT_FILENAME /usr/local/bin/mailinabox-webfinger.php;
fastcgi_pass unix:/tmp/php-fastcgi.www-data.sock;
}
# ADDITIONAL DIRECTIVES HERE
}

16
management/web_update.py
View file

@ -2,7 +2,7 @@
# domains for which a mail account has been set up.
########################################################################
import os, os.path
import os, os.path, re, rtyaml
from mailconfig import get_mail_domains
from utils import shell, safe_domain_name, sort_domains
@ -67,6 +67,20 @@ def make_domain_config(domain, template, env):
nginx_conf = nginx_conf.replace("$ROOT", root)
nginx_conf = nginx_conf.replace("$SSL_KEY", ssl_key)
nginx_conf = nginx_conf.replace("$SSL_CERTIFICATE", ssl_certificate)
# Add in any user customizations.
nginx_conf_parts = re.split("(# ADDITIONAL DIRECTIVES HERE\n)", nginx_conf)
nginx_conf_custom_fn = os.path.join(env["STORAGE_ROOT"], "www/custom.yaml")
if os.path.exists(nginx_conf_custom_fn):
yaml = rtyaml.load(open(nginx_conf_custom_fn))
if domain in yaml:
yaml = yaml[domain]
if "proxy" in yaml:
nginx_conf_parts[1] += "\tlocation / {\n\t\tproxy_pass %s;\n\t}\n" % yaml["proxy"]
# Put it all together.
nginx_conf = "".join(nginx_conf_parts)
return nginx_conf
def get_web_root(domain, env):