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
449a538e
Commit
449a538e
authored
Feb 17, 2015
by
Joshua Tauberer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
if a CNAME is set for a domain, don't create a website for that domain (just like A/AAAA records)
parent
3c50c9a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
CHANGELOG.md
CHANGELOG.md
+1
-0
web_update.py
management/web_update.py
+1
-0
No files found.
CHANGELOG.md
View file @
449a538e
...
@@ -24,6 +24,7 @@ Web:
...
@@ -24,6 +24,7 @@ Web:
*
The nginx server no longer reports its version and OS for better privacy.
*
The nginx server no longer reports its version and OS for better privacy.
*
The HTTP->HTTPS redirect is now more efficient.
*
The HTTP->HTTPS redirect is now more efficient.
*
When serving a 'www.' domain, reuse the SSL certificate for the parent domain if it covers the 'www' subdomain too
*
When serving a 'www.' domain, reuse the SSL certificate for the parent domain if it covers the 'www' subdomain too
*
If a custom DNS CNAME record is set on a domain, don't offer to put a website on that domain. (Same logic already applies to custom A/AAAA records.)
Control panel:
Control panel:
...
...
management/web_update.py
View file @
449a538e
...
@@ -27,6 +27,7 @@ def get_web_domains(env):
...
@@ -27,6 +27,7 @@ def get_web_domains(env):
for
domain
,
value
in
dns
.
items
():
for
domain
,
value
in
dns
.
items
():
if
domain
not
in
domains
:
continue
if
domain
not
in
domains
:
continue
if
(
isinstance
(
value
,
str
)
and
(
value
!=
"local"
))
\
if
(
isinstance
(
value
,
str
)
and
(
value
!=
"local"
))
\
or
(
isinstance
(
value
,
dict
)
and
(
"CNAME"
in
value
))
\
or
(
isinstance
(
value
,
dict
)
and
(
"A"
in
value
)
and
(
value
[
"A"
]
!=
"local"
))
\
or
(
isinstance
(
value
,
dict
)
and
(
"A"
in
value
)
and
(
value
[
"A"
]
!=
"local"
))
\
or
(
isinstance
(
value
,
dict
)
and
(
"AAAA"
in
value
)
and
(
value
[
"AAAA"
]
!=
"local"
)):
or
(
isinstance
(
value
,
dict
)
and
(
"AAAA"
in
value
)
and
(
value
[
"AAAA"
]
!=
"local"
)):
domains
.
remove
(
domain
)
domains
.
remove
(
domain
)
...
...
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