external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00
Code Issues Releases Wiki Activity

rename whats_next.py to status_checks.py

Browse Source
This commit is contained in:
Joshua Tauberer 2014-08-21 10:43:55 +00:00
parent 6b52105b62
commit 294d19e0af
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
management/buy_certificate.py
View File

@ -14,7 +14,7 @@ import rtyaml
from utils import load_environment, shell from utils import load_environment, shell
from web_update import get_web_domains, get_domain_ssl_files, get_web_root from web_update import get_web_domains, get_domain_ssl_files, get_web_root
from whats_next import check_certificate from status_checks import check_certificate
def buy_ssl_certificate(api_key, domain, command, env): def buy_ssl_certificate(api_key, domain, command, env):
if domain != env['PRIMARY_HOSTNAME'] \ if domain != env['PRIMARY_HOSTNAME'] \

2
management/daemon.py
View File

@ -191,7 +191,7 @@ def web_update():
@app.route('/system/status', methods=["POST"]) @app.route('/system/status', methods=["POST"])
@authorized_personnel_only @authorized_personnel_only
def system_status(): def system_status():
from whats_next import run_checks from status_checks import run_checks
class WebOutput: class WebOutput:
def __init__(self): def __init__(self):
self.items = [] self.items = []

0
management/whats_next.py → management/status_checks.py
View File

2
management/web_update.py
View File

@ -140,7 +140,7 @@ def get_domain_ssl_files(domain, env):
# a Subject Alternative Name matching this domain. Don't do this if # a Subject Alternative Name matching this domain. Don't do this if
# the user has uploaded a different private key for this domain. # the user has uploaded a different private key for this domain.
if not ssl_key_is_alt: if not ssl_key_is_alt:
from whats_next import check_certificate from status_checks import check_certificate
if check_certificate(domain, ssl_certificate_primary, None) == "OK": if check_certificate(domain, ssl_certificate_primary, None) == "OK":
ssl_certificate = ssl_certificate_primary ssl_certificate = ssl_certificate_primary

2
setup/start.sh
View File

@ -329,7 +329,7 @@ echo Your Mail-in-a-Box is running.
echo echo
echo Please log in to the control panel for further instructions at: echo Please log in to the control panel for further instructions at:
echo echo
if management/whats_next.py --check-primary-hostname; then if management/status_checks.py --check-primary-hostname; then
# Show the nice URL if it appears to be resolving and has a valid certificate. # Show the nice URL if it appears to be resolving and has a valid certificate.
echo https://$PRIMARY_HOSTNAME/admin echo https://$PRIMARY_HOSTNAME/admin
echo echo