mirror
/
piku
kopia lustrzana https://github.com/piku/piku
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Stop nginx confs from leaking into LIVE_ENV. #84 (#85)

pull/87/head
Chris McCormick 2019-08-12 13:56:59 +08:00 zatwierdzone przez Rui Carmo
rodzic bfc4f8ce32
commit 7a73cd8e3e
1 zmienionych plików z 8 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
piku.py
Wyświetl plik

@ -67,7 +67,7 @@ server {
root ${ACME_WWW}; root ${ACME_WWW};
} }
$NGINX_COMMON $INTERNAL_NGINX_COMMON
} }
""" """
@ -89,7 +89,7 @@ server {
} }
server { server {
$NGINX_COMMON $INTERNAL_NGINX_COMMON
} }
""" """
# pylint: enable=anomalous-backslash-in-string # pylint: enable=anomalous-backslash-in-string
@ -118,11 +118,11 @@ NGINX_COMMON_FRAGMENT = """
# set a custom header for requests # set a custom header for requests
add_header X-Deployed-By Piku; add_header X-Deployed-By Piku;
$NGINX_CUSTOM_CLAUSES $INTERNAL_NGINX_CUSTOM_CLAUSES
$INTERNAL_NGINX_STATIC_MAPPINGS $INTERNAL_NGINX_STATIC_MAPPINGS
$NGINX_BLOCK_GIT $INTERNAL_NGINX_BLOCK_GIT
location / { location / {
$INTERNAL_NGINX_UWSGI_SETTINGS $INTERNAL_NGINX_UWSGI_SETTINGS
@ -673,9 +673,10 @@ def spawn_app(app, deltas={}):
except Exception: except Exception:
cf = defaultdict() cf = defaultdict()
echo("-----> Could not retrieve CloudFlare IP ranges: {}".format(format_exc()), fg="red") echo("-----> Could not retrieve CloudFlare IP ranges: {}".format(format_exc()), fg="red")
env['NGINX_ACL'] = " ".join(acl) env['NGINX_ACL'] = " ".join(acl)
env['NGINX_BLOCK_GIT'] = "" if env.get('NGINX_ALLOW_GIT_FOLDERS') else "location ~ /\.git { deny all; }" env['INTERNAL_NGINX_BLOCK_GIT'] = "" if env.get('NGINX_ALLOW_GIT_FOLDERS') else "location ~ /\.git { deny all; }"
env['INTERNAL_NGINX_STATIC_MAPPINGS'] = '' env['INTERNAL_NGINX_STATIC_MAPPINGS'] = ''
@ -693,8 +694,8 @@ def spawn_app(app, deltas={}):
echo("Error {} in static path spec: should be /url1:path1[,/url2:path2], ignoring.".format(e)) echo("Error {} in static path spec: should be /url1:path1[,/url2:path2], ignoring.".format(e))
env['INTERNAL_NGINX_STATIC_MAPPINGS'] = '' env['INTERNAL_NGINX_STATIC_MAPPINGS'] = ''
env['NGINX_CUSTOM_CLAUSES'] = expandvars(open(join(app_path, env["NGINX_INCLUDE_FILE"])).read(), env) if env.get("NGINX_INCLUDE_FILE") else "" env['INTERNAL_NGINX_CUSTOM_CLAUSES'] = expandvars(open(join(app_path, env["NGINX_INCLUDE_FILE"])).read(), env) if env.get("NGINX_INCLUDE_FILE") else ""
env['NGINX_COMMON'] = expandvars(NGINX_COMMON_FRAGMENT, env) env['INTERNAL_NGINX_COMMON'] = expandvars(NGINX_COMMON_FRAGMENT, env)
echo("-----> nginx will map app '{}' to hostname '{}'".format(app, env['NGINX_SERVER_NAME'])) echo("-----> nginx will map app '{}' to hostname '{}'".format(app, env['NGINX_SERVER_NAME']))
if('NGINX_HTTPS_ONLY' in env) or ('HTTPS_ONLY' in env): if('NGINX_HTTPS_ONLY' in env) or ('HTTPS_ONLY' in env):