Skip to content

Commit

Permalink
reset git
Browse files Browse the repository at this point in the history
  • Loading branch information
oxfordfun committed Jun 30, 2023
0 parents commit 2f914d6
Show file tree
Hide file tree
Showing 114 changed files with 6,623 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
env/
.DS*
Empty file added .nojekyll
Empty file.
25 changes: 25 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Minimal makefile for Sphinx documentation
#

# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = source
BUILDDIR = docs

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

.PHONY: help Makefile

# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
mv docs/html/_static docs/static
mv docs/html/_sources docs/sources
mv docs/html/* docs
find docs -type f -exec sed -i '' -e 's/_static/static/g' {} \;
find docs -type f -exec sed -i '' -e 's/_sources/sources/g' {} \;
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# daaas-info
Information about DAaaS Group
4 changes: 4 additions & 0 deletions docs/.!16077!objects.inv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Sphinx inventory version 2
# Project: daaas
# Version:
# The remainder of this file is compressed using zlib.
4 changes: 4 additions & 0 deletions docs/.!16160!objects.inv
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Sphinx inventory version 2
# Project: daaas
# Version:
# The remainder of this file is compressed using zlib.
209 changes: 209 additions & 0 deletions docs/2023-06-TechUpdate.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,209 @@
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>ISIS DAaaS Tech Update - June 2023 &mdash; daaas 1.0 documentation</title>
<link rel="stylesheet" href="static/pygments.css" type="text/css" />
<link rel="stylesheet" href="static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="static/js/html5shiv.min.js"></script>
<![endif]-->

<script src="static/jquery.js"></script>
<script src="static/_sphinx_javascript_frameworks_compat.js"></script>
<script data-url_root="./" id="documentation_options" src="static/documentation_options.js"></script>
<script src="static/doctools.js"></script>
<script src="static/sphinx_highlight.js"></script>
<script src="static/js/theme.js"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
<link rel="next" title="Scientific Software @ DAaaS" href="software.html" />
<link rel="prev" title="Welcome to My Documentation" href="index.html" />
</head>

<body class="wy-body-for-nav">
<div class="wy-grid-for-nav">
<nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-scroll">
<div class="wy-side-nav-search" >



<a href="index.html" class="icon icon-home">
daaas
</a>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
</div>
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
<ul class="current">
<li class="toctree-l1 current"><a class="current reference internal" href="#">ISIS DAaaS Tech Update - June 2023</a><ul>
<li class="toctree-l2"><a class="reference internal" href="software.html">Scientific Software &#64; DAaaS</a></li>
<li class="toctree-l2"><a class="reference internal" href="isis-data-cache.html">ISIS Instrument Data Cache</a></li>
<li class="toctree-l2"><a class="reference internal" href="#platform">Platform</a></li>
<li class="toctree-l2"><a class="reference internal" href="#scientific-software">Scientific Software</a></li>
<li class="toctree-l2"><a class="reference internal" href="#workspaces">Workspaces</a></li>
<li class="toctree-l2"><a class="reference internal" href="#data">Data</a></li>
<li class="toctree-l2"><a class="reference internal" href="#training">Training</a></li>
<li class="toctree-l2"><a class="reference internal" href="#services">Services</a><ul>
<li class="toctree-l3"><a class="reference internal" href="#incidents">Incidents</a></li>
<li class="toctree-l3"><a class="reference internal" href="#maintenance">Maintenance</a></li>
<li class="toctree-l3"><a class="reference internal" href="#uptime">Uptime</a></li>
</ul>
</li>
</ul>
</li>
</ul>

</div>
</div>
</nav>

<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" >
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">daaas</a>
</nav>

<div class="wy-nav-content">
<div class="rst-content">
<div role="navigation" aria-label="Page navigation">
<ul class="wy-breadcrumbs">
<li><a href="index.html" class="icon icon-home" aria-label="Home"></a></li>
<li class="breadcrumb-item active">ISIS DAaaS Tech Update - June 2023</li>
<li class="wy-breadcrumbs-aside">
<a href="sources/2023-06-TechUpdate.rst.txt" rel="nofollow"> View page source</a>
</li>
</ul>
<hr/>
</div>
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">

<section id="isis-daaas-tech-update-june-2023">
<h1>ISIS DAaaS Tech Update - June 2023<a class="headerlink" href="#isis-daaas-tech-update-june-2023" title="Permalink to this heading"></a></h1>
<div class="toctree-wrapper compound">
<ul>
<li class="toctree-l1"><a class="reference internal" href="software.html">Scientific Software &#64; DAaaS</a></li>
<li class="toctree-l1"><a class="reference internal" href="isis-data-cache.html">ISIS Instrument Data Cache</a></li>
</ul>
</div>
<section id="platform">
<h2>Platform<a class="headerlink" href="#platform" title="Permalink to this heading"></a></h2>
<p>As you may be aware, CentOS has reached its end of life. To ensure
continued security, stability, and support, we have migrated the DAaaS
platform to Rocky 8 Linux, a reliable and compatible alternative.</p>
</section>
<section id="scientific-software">
<h2>Scientific Software<a class="headerlink" href="#scientific-software" title="Permalink to this heading"></a></h2>
<p>We have been containerising scientific software to make it easy to
install, upgrade and deploy to DAaaS platform.</p>
<p>If you are developing any software that aims to be deployed into DAaaS
workspaces, packing it in <a class="reference external" href="https://apptainer.org/docs/user/latest/">an
Apptainer</a> is the fastest
way to get it deployed. Please get in touch if you need any guidance.</p>
<p>A full list of scientific software on DAaaS platform is in section of
<a class="reference internal" href="software.html"><span class="doc">Scientific Software &#64; DAaaS</span></a>.</p>
</section>
<section id="workspaces">
<h2>Workspaces<a class="headerlink" href="#workspaces" title="Permalink to this heading"></a></h2>
<p>We have also been working on upgrading workspaces to Rocky 8 Linux. This
will replace the aging CentOS7 Linux distribution we currently use.</p>
<p>In the coming months, we will work with each instrument group one-by-one
to upgrade your workspaces to Rocky 8 alongside redeploying all of the
scientific software on your group’s workspaces in Apptainer containers
(Python packages and other appropriate software can be installed with
Conda or Python virtual environments also). We will get in touch with
each group for this upgrade.</p>
</section>
<section id="data">
<h2>Data<a class="headerlink" href="#data" title="Permalink to this heading"></a></h2>
<p>In the new updated workspaces, we alsp plan to disconnect ISIS Archive
from workspaces. All new workspaces will use ISIS Instrument Data Cache,
which aligns with ISIS Data Policy.</p>
<p>Details about ISIS Instrument Data Cache can be found in section of
<a class="reference internal" href="isis-data-cache.html"><span class="doc">ISIS Instrument Data Cache</span></a>.</p>
</section>
<section id="training">
<h2>Training<a class="headerlink" href="#training" title="Permalink to this heading"></a></h2>
<p><a class="reference external" href="https://training.analysis.stfc.ac.uk/">DAaaS Training Site</a> has been
on trial since February 2023. This is a dedicated platform for resources
defined and allocated for training, workshops or conferences. It has
following features:</p>
<ul class="simple">
<li><p>Training organizers can request and manage courses</p></li>
<li><p>Attendees can be anywhere in the world to access the resources</p></li>
<li><p>A bespoke workspace can be requested for the course</p></li>
<li><p>There is a dedicated storage for training materials</p></li>
<li><p>Training organizers can have assistants to help the attendees</p></li>
<li><p>Attendees can access the training workspace with an invitation click</p></li>
</ul>
<p>Please get in touch for more details or trying out on the site.</p>
<p>Special thanks to ISIS Excitation Group and Research Software
Engineering Group helping us on testing the site.</p>
</section>
<section id="services">
<h2>Services<a class="headerlink" href="#services" title="Permalink to this heading"></a></h2>
<section id="incidents">
<h3>Incidents<a class="headerlink" href="#incidents" title="Permalink to this heading"></a></h3>
<ul class="simple">
<li><p><a class="reference external" href="https://daaas.statuspage.io/incidents/zfmjygvgv7pt">April 26 - RAL Power
Cut</a></p></li>
<li><p><a class="reference external" href="https://daaas.statuspage.io/incidents/l6td526zkx1d">May 18 - User Office Site
Unavailable</a></p></li>
</ul>
</section>
<section id="maintenance">
<h3>Maintenance<a class="headerlink" href="#maintenance" title="Permalink to this heading"></a></h3>
<ul class="simple">
<li><p><a class="reference external" href="https://daaas.statuspage.io/incidents/pcb6f1bpszv6">January 4 - DAaaS Security
Update</a></p></li>
<li><p><a class="reference external" href="https://daaas.statuspage.io/incidents/97yrj52wnhkq">March 23 - User Office Security
Patching</a></p></li>
</ul>
</section>
<section id="uptime">
<h3>Uptime<a class="headerlink" href="#uptime" title="Permalink to this heading"></a></h3>
<p><a class="reference external" href="https://daaas.statuspage.io/uptime/wx9ylxz0swdh?page=1">Check out DAaaS Status
Page</a></p>
</section>
</section>
</section>


</div>
</div>
<footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
<a href="index.html" class="btn btn-neutral float-left" title="Welcome to My Documentation" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
<a href="software.html" class="btn btn-neutral float-right" title="Scientific Software @ DAaaS" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
</div>

<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2023, fan.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
<a href="https://github.com/readthedocs/sphinx_rtd_theme">theme</a>
provided by <a href="https://readthedocs.org">Read the Docs</a>.


</footer>
</div>
</div>
</section>
</div>
<script>
jQuery(function () {
SphinxRtdTheme.Navigation.enable(true);
});
</script>

</body>
</html>
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Binary file added docs/doctrees/2023-06-TechUpdate.doctree
Binary file not shown.
Binary file added docs/doctrees/environment.pickle
Binary file not shown.
Binary file added docs/doctrees/index.doctree
Binary file not shown.
Binary file added docs/doctrees/isis-data-cache.doctree
Binary file not shown.
Binary file added docs/doctrees/software.doctree
Binary file not shown.
104 changes: 104 additions & 0 deletions docs/genindex.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
<!DOCTYPE html>
<html class="writer-html5" lang="en" >
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Index &mdash; daaas 1.0 documentation</title>
<link rel="stylesheet" href="static/pygments.css" type="text/css" />
<link rel="stylesheet" href="static/css/theme.css" type="text/css" />
<!--[if lt IE 9]>
<script src="static/js/html5shiv.min.js"></script>
<![endif]-->

<script src="static/jquery.js"></script>
<script src="static/_sphinx_javascript_frameworks_compat.js"></script>
<script data-url_root="./" id="documentation_options" src="static/documentation_options.js"></script>
<script src="static/doctools.js"></script>
<script src="static/sphinx_highlight.js"></script>
<script src="static/js/theme.js"></script>
<link rel="index" title="Index" href="#" />
<link rel="search" title="Search" href="search.html" />
</head>

<body class="wy-body-for-nav">
<div class="wy-grid-for-nav">
<nav data-toggle="wy-nav-shift" class="wy-nav-side">
<div class="wy-side-scroll">
<div class="wy-side-nav-search" >



<a href="index.html" class="icon icon-home">
daaas
</a>
<div role="search">
<form id="rtd-search-form" class="wy-form" action="search.html" method="get">
<input type="text" name="q" placeholder="Search docs" aria-label="Search docs" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
</div>
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
<ul>
<li class="toctree-l1"><a class="reference internal" href="2023-06-TechUpdate.html">ISIS DAaaS Tech Update - June 2023</a></li>
</ul>

</div>
</div>
</nav>

<section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" >
<i data-toggle="wy-nav-top" class="fa fa-bars"></i>
<a href="index.html">daaas</a>
</nav>

<div class="wy-nav-content">
<div class="rst-content">
<div role="navigation" aria-label="Page navigation">
<ul class="wy-breadcrumbs">
<li><a href="index.html" class="icon icon-home" aria-label="Home"></a></li>
<li class="breadcrumb-item active">Index</li>
<li class="wy-breadcrumbs-aside">
</li>
</ul>
<hr/>
</div>
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
<div itemprop="articleBody">


<h1 id="index">Index</h1>

<div class="genindex-jumpbox">

</div>


</div>
</div>
<footer>

<hr/>

<div role="contentinfo">
<p>&#169; Copyright 2023, fan.</p>
</div>

Built with <a href="https://www.sphinx-doc.org/">Sphinx</a> using a
<a href="https://github.com/readthedocs/sphinx_rtd_theme">theme</a>
provided by <a href="https://readthedocs.org">Read the Docs</a>.


</footer>
</div>
</div>
</section>
</div>
<script>
jQuery(function () {
SphinxRtdTheme.Navigation.enable(true);
});
</script>

</body>
</html>
4 changes: 4 additions & 0 deletions docs/html/.buildinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 6a375f8b3961cece0f635bc7aa1b7726
tags: 645f666f9bcd5a90fca523b33c5a78b7
Loading

0 comments on commit 2f914d6

Please sign in to comment.