Skip to content

Commit

Permalink
Merge pull request #98 from GooBall/sla
Browse files Browse the repository at this point in the history
Add SLA page
  • Loading branch information
apdibbo committed Apr 15, 2016
2 parents 19ca6b9 + 5820df8 commit 75cad2f
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 3 deletions.
34 changes: 34 additions & 0 deletions assets/dynamic/sla.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<p>The SCD Cloud is a service developed for use within Scientific Computing and the wider STFC for developing and supporting projects. SCD Cloud usage must comply with the <a href="https://cloud.stfc.ac.uk/tos">Terms of Service</a>. If you have any questions regarding the following, please contact <a href="mailto:[email protected]">[email protected]</a></p>
<p>By continuing to log in you accept the following Service Level for Virtual Machines (VMs):</p>
<ul>


<li>Support</li>
<ul>
<li>Technical Support for the SCD Cloud is offered during working hours.</li>
<li>Tickets will be responded to within 2 working days.</li>
<li>Support for the end-users of services hosted on the SCD Cloud is not provided, this includes but is not limited to using the Operating System.</li>
</ul>
<br>
<li>Availability</li>
<ul>
<li>We endeavour to minimize downtime of VMs however some is inevitable.</li>
<li>Services built on the SCD Cloud where availability is important must be architected in such a way that they can tolerate VMs being unavailable.</li>
<li>VMs are configured to update automatically although monthly reboots will be required.</li>
</ul>
<br>
<li>Storage</li>
<ul>
<li>The storage underlying the SCD Cloud is resilient for the purposes of availability of VMs.</li>
<li>VMs on the SCD Cloud should not be used as a persistent Datastore.</li>
<li>If you require more security for your data then arrange to back up your VMs.</li>
</ul>
<br>
<li>Maintenance</li>
<ul>
<li>We will endeavour to provide notification of scheduled downtimes of 2 working days.</li>
<li>Regular maintenance will take place on Wednesday mornings between 10am and 12pm. The service should be considered at risk during this period.</li>
<li>If a security patch requires it, you will normally be given 5 working days within which to reboot VMs, after which time a reboot will be forced.</li>
<li>We reserve the right to reboot VMs without notice in order to preserve the integrity of the service.</li>
</ul>
</ul>
6 changes: 6 additions & 0 deletions controllers/home.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ def tos(self):
EMAIL = cherrypy.request.config.get("email")
return {"email" : EMAIL}

@cherrypy.tools.jinja(template="home/sla.html")
@cherrypy.expose
def sla(self):
EMAIL = cherrypy.request.config.get("email")
return {"email" : EMAIL}

@cherrypy.tools.jinja(template="home/login.html")
@cherrypy.expose
def login(self):
Expand Down
4 changes: 2 additions & 2 deletions views/home/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="col-md-6">
<h1 class="page-header">Login</h1>
<p>
You can access the cloud and any of your virtual machines with your Federal Credentials. By proceeding to log in, you agree to the <a href="/tos">Terms of Service</a>.
You can access the cloud and any of your virtual machines with your Federal Credentials. By proceeding to log in, you agree to the <a href="/tos">Terms of Service</a> and <a href="/sla">Service-level Agreement</a>.
</p>
</div>
<div class="col-md-4 col-md-offset-1">
Expand Down Expand Up @@ -44,4 +44,4 @@ <h1 class="page-header">Login</h1>
</div>
</div>
</div>
{% endblock %}
{% endblock %}
19 changes: 19 additions & 0 deletions views/home/sla.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{% set title = "Service-level Agreement" %}

{% extends "layout.html" %}

{% block javascript %}
<script type="text/javascript">
$('#sla').load('assets/dynamic/sla.html');
</script>
{% endblock %}

{% block content %}
<div class="row">
<div class="col-md-12">
<h1 class="page-header">Service-level Agreement</h1>
<p><span id="sla"></span></p>
</div>
</div>

{% endblock %}
3 changes: 2 additions & 1 deletion views/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
<ul class="nav navbar-nav">
<li{{ ' class="active"' if title == 'Home' }}><a href="/">Home</a></li>
<li{{ ' class="active"' if title == 'Terms of Service' }}><a href="/tos">Terms</a></li>
<li{{ ' class="active"' if title == 'Service-level Agreement' }}><a href="/sla">SLA</a></li>
<li{{ ' class="active"' if title == 'Machine FAQ' }}><a href="/faq">FAQs</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
Expand Down Expand Up @@ -64,7 +65,7 @@

<footer class="footer">
<div id="footer-bottom" class="text-center">
&copy; Copyright STFC 2016 &nbsp; | &nbsp;<a href="/tos">Terms of Service</a>&nbsp; | &nbsp;<a href="/faq">Frequently Asked Questions</a>&nbsp; | &nbsp;<a href="https://github.com/stfc/cloud">GitHub</a>&nbsp; | &nbsp;<a href="https://github.com/stfc/cloud/issues">Issue Tracker</a>
&copy; Copyright STFC 2016 &nbsp; | &nbsp;<a href="/tos">Terms of Service</a>&nbsp; | &nbsp;<a href="/sla">Service-level Agreement</a>&nbsp; | &nbsp;<a href="/faq">Frequently Asked Questions</a>&nbsp; | &nbsp;<a href="https://github.com/stfc/cloud">GitHub</a>&nbsp; | &nbsp;<a href="https://github.com/stfc/cloud/issues">Issue Tracker</a>
</div>
</footer>
<script src="/assets/components/jquery/jquery-2.2.0.min.js"></script>
Expand Down

0 comments on commit 75cad2f

Please sign in to comment.