Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mailinabox
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
mailinabox
Commits
43fe2fe2
Commit
43fe2fe2
authored
Aug 26, 2014
by
Joshua Tauberer
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #162 from skosch/patch-2
Replace spaces by tabs in 106-109. See
92c7815d
.
parents
92c7815d
2afd0be5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
web_update.py
management/web_update.py
+4
-4
No files found.
management/web_update.py
View file @
43fe2fe2
...
@@ -103,10 +103,10 @@ def make_domain_config(domain, template, template_for_primaryhost, env):
...
@@ -103,10 +103,10 @@ def make_domain_config(domain, template, template_for_primaryhost, env):
for
path
,
url
in
yaml
.
get
(
"proxies"
,
{})
.
items
():
for
path
,
url
in
yaml
.
get
(
"proxies"
,
{})
.
items
():
nginx_conf
+=
"
\t
location
%
s {
\n\t\t
proxy_pass
%
s;
\n\t
}
\n
"
%
(
path
,
url
)
nginx_conf
+=
"
\t
location
%
s {
\n\t\t
proxy_pass
%
s;
\n\t
}
\n
"
%
(
path
,
url
)
# Add in any user customizations in the includes/ folder.
# Add in any user customizations in the includes/ folder.
nginx_conf_custom_include
=
os
.
path
.
join
(
env
[
"STORAGE_ROOT"
],
"www"
,
safe_domain_name
(
domain
)
+
".conf"
)
nginx_conf_custom_include
=
os
.
path
.
join
(
env
[
"STORAGE_ROOT"
],
"www"
,
safe_domain_name
(
domain
)
+
".conf"
)
if
os
.
path
.
exists
(
nginx_conf_custom_include
):
if
os
.
path
.
exists
(
nginx_conf_custom_include
):
nginx_conf
+=
"
\t
include
%
s;
\n
"
%
(
nginx_conf_custom_include
)
nginx_conf
+=
"
\t
include
%
s;
\n
"
%
(
nginx_conf_custom_include
)
# Ending.
# Ending.
nginx_conf
+=
nginx_conf_parts
[
1
]
nginx_conf
+=
nginx_conf_parts
[
1
]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment