Skip to content

slapos
slapos
Commit 70cd4824 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

software/caddy-frontend: Improve not found text 

As there might be some reasons why the instance is not found explain what to
in each case.
parent d76355cc
Pipeline #11635 passed with stage
    in 0 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 26 additions and 6 deletions
    software/caddy-frontend/buildout.hash.cfg
    View file @ 70cd4824
    ...@@ -46,7 +46,7 @@ md5sum = 0979a03476e86bf038516c9565dadc17 ...@@ -46,7 +46,7 @@ md5sum = 0979a03476e86bf038516c9565dadc17
    [template-not-found-html] [template-not-found-html]
    _update_hash_filename_ = templates/notfound.html _update_hash_filename_ = templates/notfound.html
    md5sum = f20d6c3d2d94fb685f8d26dfca1e822b md5sum = 88af61e7abbf30dc99a1a2526161128d
    [template-default-slave-virtualhost] [template-default-slave-virtualhost]
    _update_hash_filename_ = templates/default-virtualhost.conf.in _update_hash_filename_ = templates/default-virtualhost.conf.in
    ......
    software/caddy-frontend/templates/notfound.html
    View file @ 70cd4824
    ...@@ -3,7 +3,17 @@ ...@@ -3,7 +3,17 @@
    <title>Instance not found</title> <title>Instance not found</title>
    </head> </head>
    <body> <body>
    <h1>This instance has not been found.</h1> <h1>The instance has not been found</h1>
    <p>If this error persists, please check your instance URL and status on SlapOS Master.</p> <p>The reasons of this could be:</p>
    <ul>
    <li>the instance does not exists or the URL is incorrect
    <ul>
    <li>in this case please check the URL
    </ul>
    <li>the instance has been stopped
    <ul>
    <li>in this case please check in the SlapOS Master if the instance is started or wait a bit for it to start
    </ul>
    </ul>
    </body> </body>
    </html> </html>
    software/caddy-frontend/test/test.py
    View file @ 70cd4824
    ...@@ -1628,9 +1628,19 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin): ...@@ -1628,9 +1628,19 @@ class TestSlave(SlaveHttpFrontendTestCase, TestDataMixin):
    <title>Instance not found</title> <title>Instance not found</title>
    </head> </head>
    <body> <body>
    <h1>This instance has not been found.</h1> <h1>The instance has not been found</h1>
    <p>If this error persists, please check your instance URL and status on S""" <p>The reasons of this could be:</p>
    """lapOS Master.</p> <ul>
    <li>the instance does not exists or the URL is incorrect
    <ul>
    <li>in this case please check the URL
    </ul>
    <li>the instance has been stopped
    <ul>
    <li>in this case please check in the SlapOS Master if the instance is """
    """started or wait a bit for it to start
    </ul>
    </ul>
    </body> </body>
    </html> </html>
    """, """,
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7