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
faaa74c3
Commit
faaa74c3
authored
Jan 14, 2016
by
Joshua Tauberer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tls: hide extra reasons why domains aren't getting a new certificate during setup
parent
2ad7d083
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
4 deletions
+9
-4
ssl_certificates.py
management/ssl_certificates.py
+7
-3
start.sh
setup/start.sh
+2
-1
No files found.
management/ssl_certificates.py
View file @
faaa74c3
...
@@ -253,7 +253,7 @@ def get_certificates_to_provision(env, show_extended_problems=True, force_domain
...
@@ -253,7 +253,7 @@ def get_certificates_to_provision(env, show_extended_problems=True, force_domain
return
(
domains
,
problems
)
return
(
domains
,
problems
)
def
provision_certificates
(
env
,
agree_to_tos_url
=
None
,
logger
=
None
,
force_domains
=
None
,
jsonable
=
False
):
def
provision_certificates
(
env
,
agree_to_tos_url
=
None
,
logger
=
None
,
show_extended_problems
=
True
,
force_domains
=
None
,
jsonable
=
False
):
import
requests.exceptions
import
requests.exceptions
import
acme.messages
import
acme.messages
...
@@ -261,7 +261,7 @@ def provision_certificates(env, agree_to_tos_url=None, logger=None, force_domain
...
@@ -261,7 +261,7 @@ def provision_certificates(env, agree_to_tos_url=None, logger=None, force_domain
# What domains should we provision certificates for? And what
# What domains should we provision certificates for? And what
# errors prevent provisioning for other domains.
# errors prevent provisioning for other domains.
domains
,
problems
=
get_certificates_to_provision
(
env
,
force_domains
=
force_domains
)
domains
,
problems
=
get_certificates_to_provision
(
env
,
force_domains
=
force_domains
,
show_extended_problems
=
show_extended_problems
)
# Exit fast if there is nothing to do.
# Exit fast if there is nothing to do.
if
len
(
domains
)
==
0
:
if
len
(
domains
)
==
0
:
...
@@ -405,12 +405,16 @@ def provision_certificates_cmdline():
...
@@ -405,12 +405,16 @@ def provision_certificates_cmdline():
verbose
=
False
verbose
=
False
headless
=
False
headless
=
False
force_domains
=
None
force_domains
=
None
show_extended_problems
=
True
args
=
list
(
sys
.
argv
)
args
=
list
(
sys
.
argv
)
args
.
pop
(
0
)
# program name
args
.
pop
(
0
)
# program name
if
args
and
args
[
0
]
==
"-v"
:
if
args
and
args
[
0
]
==
"-v"
:
verbose
=
True
verbose
=
True
args
.
pop
(
0
)
args
.
pop
(
0
)
if
args
and
args
[
0
]
==
"q"
:
show_extended_problems
=
False
args
.
pop
(
0
)
if
args
and
args
[
0
]
==
"--headless"
:
if
args
and
args
[
0
]
==
"--headless"
:
headless
=
True
headless
=
True
args
.
pop
(
0
)
args
.
pop
(
0
)
...
@@ -429,7 +433,7 @@ def provision_certificates_cmdline():
...
@@ -429,7 +433,7 @@ def provision_certificates_cmdline():
def
my_logger
(
message
):
def
my_logger
(
message
):
if
verbose
:
if
verbose
:
print
(
">"
,
message
)
print
(
">"
,
message
)
status
=
provision_certificates
(
env
,
agree_to_tos_url
=
agree_to_tos_url
,
logger
=
my_logger
,
force_domains
=
force_domains
)
status
=
provision_certificates
(
env
,
agree_to_tos_url
=
agree_to_tos_url
,
logger
=
my_logger
,
force_domains
=
force_domains
,
show_extended_problems
=
show_extended_problems
)
agree_to_tos_url
=
None
# reset to prevent infinite looping
agree_to_tos_url
=
None
# reset to prevent infinite looping
if
not
status
[
"requests"
]:
if
not
status
[
"requests"
]:
...
...
setup/start.sh
View file @
faaa74c3
...
@@ -117,7 +117,8 @@ tools/dns_update
...
@@ -117,7 +117,8 @@ tools/dns_update
tools/web_update
tools/web_update
# If DNS is already working, try to provision TLS certficates from Let's Encrypt.
# If DNS is already working, try to provision TLS certficates from Let's Encrypt.
management/ssl_certificates.py
# Suppress extra reasons why domains aren't getting a new certificate.
management/ssl_certificates.py
-q
# If there aren't any mail users yet, create one.
# If there aren't any mail users yet, create one.
source
setup/firstuser.sh
source
setup/firstuser.sh
...
...
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