Commit 225cadef authored by rees_s's avatar rees_s
Browse files

Reorganised the src directory, hopefully for greater clarity.

parent 3185514d
......@@ -95,10 +95,10 @@ function dist_create_all() {
# Publishes the local worktrees ('dist_dev', 'dist_prod' and 'dist_ext') to their corresponding remote branches.
function dist_publish_all() {
cp -a src/dev_links.html dist_dev/index.html
cp -a src/prod_links.html dist_prod/index.html
cp -a src/ext_links.html dist_ext/index.html
cp -a src/ilk_links.html dist_ilk/index.html
cp -a src/dev/index.html dist_dev/index.html
cp -a src/prod/index.html dist_prod/index.html
cp -a src/ext/index.html dist_ext/index.html
cp -a src/ilk/index.html dist_ilk/index.html
cp -a src/psi_site.jpg dist_dev/background.jpg
cp -a src/psi_site.jpg dist_prod/background.jpg
cp -a src/psi_site.jpg dist_ext/background.jpg
......
# Overview
This is the **wica-links** git repository which provides a system for linking
from the Wica landing pages to the relevant wica displays (which are maintained
and deployed separately).
from the Wica landing pages on various wica servers to the relevant wica displays
(which are maintained and deployed in separate Git repos).
Since April 2021 this project supports the displays that have been created for
the ILK Upgrade project.
# Supported Servers
The following autodeploy servers will be AUTOMATICALLY triggered by publications from this project when the
project is installed as generally anticipated, ie on a machine running inside the PSI Office Network:
* [GFA Wica External Server](https://wica.psi.ch:8443)
* [GFA Wica Production Server](https://gfa-wica.psi.ch:8443)
* [GFA Wica Development Server](https://gfa-wica-dev.psi.ch:8443)
* [GFA ILK Production Server](https://gfa-ilk-prod.psi.ch:8443)
* [GFA ILK Development Server](https://gfa-ilk-dev.psi.ch:8443)
The following autodeploy servers will can NOT be automatically triggered by this system as they are unreachable
from PSI's office network:
* [PROSCAN ILK Development Server](https://proscan-ilk.psi.ch:8443)
* [HIPA ILK Production Server](https://hipa-ilk.psi.ch:8443)
(To make updates on the above systems it is necessary to make the deployment manually by starting a
browser inside the relevant machine network and navigating to the the autodeploy server's service
configuration page.)
# How to deploy
Edit the **'dev_links'**, **'ext_links'**, **'prod_links'** and '**ilk_links'**
Edit the **'dev/index.html'**, **'ext/index.html'**, **'prod/index.html'** and '**ilk/index.html'**
files in the src directory as required. When ready for deployment on the
associated servers use the command below:
```
......@@ -17,8 +38,8 @@ associated servers use the command below:
```
This will push these directories to the respective branches on the GitLab
Server, whereupon the autodeploy servers will download and install the
required branch to the local filesystems.
Server, and send a command to the relevant autodeploy servers to download
and install the required branch to the local filesystems.
# Project Changes and Tagged Releases
......
<!doctype html>
<!--suppress HtmlUnknownTarget -->
<html lang="en">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>WICA Dev</title>
<!--suppress CssUnknownTarget -->
<style>
/*---------------------------------------------------------------------- */
......@@ -140,7 +142,7 @@
<div class = "gfa-ilk">
<h4>GFA Machine Protection System Displays</h4>
<a href="https://gfa-ilk-dev.psi.ch/gfa/ilk/index_dev.html">Main Page</a>
<a href="https://gfa-ilk-dev.psi.ch/gfa/ilk/index.html">Main Page</a>
</div>
<div class = "hipa-rf">
......@@ -152,7 +154,8 @@
<div class = "hipa-vacuum">
<h4>HIPA Vacuum Displays</h4>
<a href="./hipa/vacuum/cw.html">CW</a> <a href="./hipa/vacuum/injector2.html">Injector 2</a> <a href="./hipa/vacuum/860KeV.html">860KeV</a>
<a href="./hipa/vacuum/cw.html">CW</a> <a href="./hipa/vacuum/injector2.html">Injector 2</a>
<a href="./hipa/vacuum/860KeV.html">860KeV</a>
</div>
......
<!doctype html>
<!--suppress HtmlUnknownTarget -->
<html lang="en">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>WICA Ext</title>
<!--suppress CssUnknownTarget -->
<style>
/*---------------------------------------------------------------------- */
......
<!doctype html>
<!--suppress HtmlUnknownTarget -->
<html lang="en">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>RPS Assistant Machine Options</title>
<!--suppress CssUnknownTarget -->
<style>
/*---------------------------------------------------------------------- */
......@@ -126,8 +128,8 @@
<div class = "banner">
<h1 class="opt hipa">RPS Assistant - HIPA Production Server</h1>
<h1 class="opt proscan">RPS Assistant - PROSCAN Production Server</h1>
<h1 class="opt prod">RPS Assistant - Production Server</h1>
<h1 class="opt dev">RPS Assistant - Development Server</h1>
<h1 class="opt prod">RPS Assistant - GFA ILK Production Server</h1>
<h1 class="opt dev">RPS Assistant - GFA ILK Development Server</h1>
</div>
<div class = "gfa-status">
......@@ -135,18 +137,17 @@
<a class="opt hipa" href="./gfa/status/hipa.html">HIPA Status Display</a>
<a class="opt dev" href="./gfa/status/hipa.html">HIPA Status Display</a>
<a class="opt prod" href="./gfa/status/hipa.html">HIPA Status Display</a>
<a class="opt proscan" href="./gfa/status/proscan.html">PROSCAN Status Display</a>
<a class="opt dev" href="./gfa/status/proscan.html">PROSCAN Status Display</a>
<a class="opt prod" href="./gfa/status/proscan.html">PROSCAN Status Display</a>
</div>
<div class = "gfa-ilk">
<h4>RPS Assistant Deisplays</h4>
<a class="opt hipa" href="https://gfa-ilk-prod.psi.ch/gfa/ilk/index_hipa.html">RPS Assistant Main Page</a>
<a class="opt proscan" href="https://gfa-ilk-prod.psi.ch/gfa/ilk/index_proscan.html">RPS Assistant Main Page</a>
<a class="opt prod" href="https://gfa-ilk-prod.psi.ch/gfa/ilk/index_prod.html">RPS Assistant Main Page</a>
<a class="opt dev" href="https://gfa-ilk-prod.psi.ch/gfa/ilk/index_dev.html">RPS Assistant Main Page</a>
<h4>RPS Assistant Displays</h4>
<a class="opt hipa" href="https://hipa-ilk.psi.ch/gfa/ilk/hipa/index.html">HIPA RPS Assistant</a>
<a class="opt proscan" href="https://proscan-ilk.psi.ch/gfa/ilk/index.html">PROSCAN RPS Assistant Main Page</a>
<a class="opt prod" href="https://gfa-ilk-prod.psi.ch/gfa/ilk/index.html">ILKTEST RPS Assistant Main Page</a>
<a class="opt dev" href="https://gfa-ilk-dev.psi.ch/gfa/ilk/index.html">ILKTEST RPS Assistant Main Page</a>
</div>
</div>
......
<!doctype html>
<!--suppress HtmlUnknownTarget -->
<html lang="en">
<head>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>WICA Prod</title>
<!--suppress CssUnknownTarget -->
<style>
/*---------------------------------------------------------------------- */
......@@ -62,7 +64,6 @@
.gfa-test { grid-area: Gfa-Test; }
.other { grid-area: Other; }
.banner, .gfa-status, .gfa-ilk, .hipa-vacuum, .hipa-rf, .gfa-test, .other {
text-align: center;
}
......@@ -76,7 +77,6 @@
background-color: rgba(224,255,255, 0.9);
}
/*---------------------------------------------------------------------- */
/* 2.0 SMALL DEVICES */
/*---------------------------------------------------------------------- */
......@@ -140,7 +140,7 @@
<div class = "gfa-ilk">
<h4>GFA Machine Protection System Displays</h4>
<a href="https://gfa-ilk-prod.psi.ch/gfa/ilk/index_prod.html">Main Page</a>
<a href="https://gfa-ilk-prod.psi.ch/gfa/ilk/index.html">Main Page</a>
</div>
<div class = "hipa-rf">
......
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