Skip to content

Commit

Permalink
Merge branch 'add-web-services-config' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
JonathanWillitts committed Oct 18, 2023
2 parents ede2b9f + 6659053 commit dca57e4
Show file tree
Hide file tree
Showing 17 changed files with 479 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Changes
+++++++

unreleased
------
- add Gunicorn and Nginx web config
- add project (static HTML) landing pages

0.1.38
------
- default model manager changed from `on_site` to `objects`
Expand Down
13 changes: 13 additions & 0 deletions bin/nginx/conf/effect.clinicedc.org.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
server {
listen 80;
listen [::]:80;

root /var/www/html;
index index.html index.htm index.nginx-debian.html;

server_name effect.clinicedc.org www.effect.clinicedc.org;

location / {
try_files $uri $uri/ =404;
}
}
21 changes: 21 additions & 0 deletions bin/nginx/conf/effect_live.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# let certbot configure for https
# see https://certbot.eff.org

server {
server_name capetown.sa.effect.clinicedc.org baragwanath.sa.effect.clinicedc.org helen-joseph.sa.effect.clinicedc.org klerksdorp.sa.effect.clinicedc.org king-edward.sa.effect.clinicedc.org edendale.sa.effect.clinicedc.org livingstone.sa.effect.clinicedc.org dora-nginza.sa.effect.clinicedc.org amana.tz.effect.clinicedc.org temeke.tz.effect.clinicedc.org mwananyamala.tz.effect.clinicedc.org tshepong.sa.effect.clinicedc.org harry-gwala.sa.effect.clinicedc.org;

location = /favicon.ico { access_log off; log_not_found off; }
location ~ /apple-touch-icon(|-\d+x\d+)(|-precomposed).png { access_log off; log_not_found off; }

location / {
include proxy_params;
proxy_pass http://unix:/run/gunicorn-live.sock;
}

# not needed if using AWS
# location /static/ {
# autoindex on;
# root /home/live/static/;
#}

}
18 changes: 18 additions & 0 deletions bin/nginx/conf/effect_live_sites.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# let certbot configure for https
# see https://certbot.eff.org

server {

root /var/www/html/live.effect.clinicedc.org;
index index.html index.htm;

server_name live.effect.clinicedc.org;

location = /favicon.ico { access_log off; log_not_found off; }
location ~ /apple-touch-icon(|-\d+x\d+)(|-precomposed).png { access_log off; log_not_found off; }

location / {
try_files $uri $uri/ =404;
}

}
20 changes: 20 additions & 0 deletions bin/nginx/conf/effect_uat.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# let certbot configure for https
# see https://certbot.eff.org

server {
server_name capetown.uat.sa.effect.clinicedc.org baragwanath.uat.sa.effect.clinicedc.org helen-joseph.uat.sa.effect.clinicedc.org klerksdorp.uat.sa.effect.clinicedc.org king-edward.uat.sa.effect.clinicedc.org edendale.uat.sa.effect.clinicedc.org livingstone.uat.sa.effect.clinicedc.org dora-nginza.uat.sa.effect.clinicedc.org amana.uat.tz.effect.clinicedc.org temeke.uat.tz.effect.clinicedc.org mwananyamala.uat.tz.effect.clinicedc.org;
location = /favicon.ico { access_log off; log_not_found off; }
location ~ /apple-touch-icon(|-\d+x\d+)(|-precomposed).png { access_log off; log_not_found off; }

location / {
include proxy_params;
proxy_pass http://unix:/run/gunicorn-uat.sock;
}

# not needed if using AWS
# location /static/ {
# autoindex on;
# root /home/live/static/;
#}

}
18 changes: 18 additions & 0 deletions bin/nginx/conf/effect_uat_sites.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# let certbot configure for https
# see https://certbot.eff.org

server {

root /var/www/html/uat.effect.clinicedc.org;
index index.html index.htm;

server_name uat.effect.clinicedc.org;

location = /favicon.ico { access_log off; log_not_found off; }
location ~ /apple-touch-icon(|-\d+x\d+)(|-precomposed).png { access_log off; log_not_found off; }

location / {
try_files $uri $uri/ =404;
}

}
50 changes: 50 additions & 0 deletions bin/nginx/www/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html lang="en">

<head>
<title>EFFECT Sites</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
</head>

<body>

<div class="jumbotron text-center">
<h2>EFFECT Sites</h2>
<p>Select a site to continue</p>
</div>


<div class="container">

<div class="row">
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="panel panel-success">
<div class="panel-heading">EFFECT Trial</div>
<div class="list-group">
<a href="https://live.effect.clinicedc.org/sa" class="list-group-item">South Africa</a>
<a href="https://live.effect.clinicedc.org/tz" class="list-group-item">Tanzania</a>
</div>
</div>
</div>

<div class="col-sm-4">
<div class="panel panel-danger">
<div class="panel-heading">EFFECT Trial UAT (Test)</div>
<div class="list-group">
<a href="https://uat.effect.clinicedc.org/sa" class="list-group-item">South Africa (UAT)</a>
<a href="https://uat.effect.clinicedc.org/tz" class="list-group-item">Tanzania (UAT)</a>
</div>
</div>
</div>

<div class="col-sm-2"></div>

</div>
</div>
</body>
</html>
50 changes: 50 additions & 0 deletions bin/nginx/www/live.effect.clinicedc.org/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html lang="en">

<head>
<title>EFFECT Sites</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
</head>

<body>

<div class="jumbotron text-center">
<h2>EFFECT Sites</h2>
<p>Select a site to continue</p>
</div>


<div class="container">

<div class="row">
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="panel panel-success">
<div class="panel-heading">EFFECT Trial LIVE</div>
<div class="list-group">
<a href="https://live.effect.clinicedc.org/sa" class="list-group-item">South Africa</a>
<a href="https://live.effect.clinicedc.org/tz" class="list-group-item">Tanzania</a>
</div>
</div>
</div>

<div class="col-sm-4">
<div class="panel panel-danger">
<div class="panel-heading">EFFECT Trial UAT (Test)</div>
<div class="list-group">
<a href="https://uat.effect.clinicedc.org/sa" class="list-group-item">South Africa (UAT)</a>
<a href="https://uat.effect.clinicedc.org/tz" class="list-group-item">Tanzania (UAT)</a>
</div>
</div>
</div>

<div class="col-sm-2"></div>

</div>
</div>
</body>
</html>
48 changes: 48 additions & 0 deletions bin/nginx/www/live.effect.clinicedc.org/sa/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<!DOCTYPE html>
<html lang="en">

<head>
<title>EFFECT Trial LIVE Sites</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.1/css/all.css" integrity="sha384-O8whS3fhG2OnA5Kas0Y9l3cfpmYjapjI0E4theH4iuMD+pLhbf6JI0jIMfYcK3yZ" crossorigin="anonymous">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
</head>

<body>

<div class="jumbotron text-center">
<h2>EFFECT Trial LIVE: South Africa</h2>
<p>Select a site to continue</p>
</div>

<div class="container">
<div class="row">
<div class="col-sm-4"></div>
<div class="col-sm-4">
<div class="panel panel-success">
<div class="panel-heading">EFFECT Trial LIVE: South Africa</div>
<div class="list-group">
<a href="https://effect.clinicedc.org/" class="list-group-item"><i class="fas fa-reply fa-fw" aria-hidden="true"></i> Home</a>
<a href="#" class="list-group-item disabled">UCT</a>
<a href="https://capetown.sa.effect.clinicedc.org/" class="list-group-item">Khayelitsha and Mitchell’s Plain Hospital 110</a>
<a href="#" class="list-group-item disabled">UKZN</a>
<a href="https://harry-gwala.sa.effect.clinicedc.org/" class="list-group-item">Harry Gwala (Pietermaritzburg) 160</a>
<a href="https://king-edward.sa.effect.clinicedc.org/" class="list-group-item">King Edward VIII Hospital 150</a>
<a href="#" class="list-group-item disabled">Wits</a>
<a href="https://baragwanath.sa.effect.clinicedc.org/" class="list-group-item">Chris Hani Baragwanath Hospital 120</a>
<a href="https://helen-joseph.sa.effect.clinicedc.org/" class="list-group-item">Helen Joseph Hospital 130</a>
<a href="https://tshepong.sa.effect.clinicedc.org/" class="list-group-item">Tshepong (Klerksdorp) Hospital 140</a>
<a href="#" class="list-group-item disabled">WSU</a>
<a href="https://livingstone.sa.effect.clinicedc.org/" class="list-group-item">Livingstone (Gqeberha) 170</a>
<a href="https://dora-nginza.sa.effect.clinicedc.org/" class="list-group-item">Dora Nginza (Gqeberha) 180</a>
</div>
</div>
</div>
<div class="col-sm-4"></div>
</div>
</div>
</body>
</html>
39 changes: 39 additions & 0 deletions bin/nginx/www/live.effect.clinicedc.org/tz/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<!DOCTYPE html>
<html lang="en">

<head>
<title>EFFECT Trial LIVE Sites</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.1/css/all.css" integrity="sha384-O8whS3fhG2OnA5Kas0Y9l3cfpmYjapjI0E4theH4iuMD+pLhbf6JI0jIMfYcK3yZ" crossorigin="anonymous">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
</head>

<body>

<div class="jumbotron text-center">
<h2>EFFECT Trial LIVE: Tanzania</h2>
<p>Select a site to continue</p>
</div>

<div class="container">
<div class="row">
<div class="col-sm-4"></div>
<div class="col-sm-4">
<div class="panel panel-success">
<div class="panel-heading">EFFECT Trial LIVE: Tanzania</div>
<div class="list-group">
<a href="https://effect.clinicedc.org/" class="list-group-item"><i class="fas fa-reply fa-fw" aria-hidden="true"></i> Home</a>
<a href="https://amana.tz.effect.clinicedc.org/" class="list-group-item">Amana 200</a>
<a href="https://mwananyamala.tz.effect.clinicedc.org/" class="list-group-item">Mwananyamala 220</a>
<a href="https://temeke.tz.effect.clinicedc.org/" class="list-group-item">Temeke 210</a>
</div>
</div>
</div>
<div class="col-sm-4"></div>
</div>
</div>
</body>
</html>
50 changes: 50 additions & 0 deletions bin/nginx/www/uat.effect.clinicedc.org/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<!DOCTYPE html>
<html lang="en">

<head>
<title>EFFECT Sites</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
</head>

<body>

<div class="jumbotron text-center">
<h2>EFFECT Sites</h2>
<p>Select a site to continue</p>
</div>


<div class="container">

<div class="row">
<div class="col-sm-2"></div>
<div class="col-sm-4">
<div class="panel panel-success">
<div class="panel-heading">EFFECT Trial LIVE</div>
<div class="list-group">
<a href="https://live.effect.clinicedc.org/sa" class="list-group-item">South Africa</a>
<a href="https://live.effect.clinicedc.org/tz" class="list-group-item">Tanzania</a>
</div>
</div>
</div>

<div class="col-sm-4">
<div class="panel panel-danger">
<div class="panel-heading">EFFECT Trial UAT (Test)</div>
<div class="list-group">
<a href="https://uat.effect.clinicedc.org/sa" class="list-group-item">South Africa (UAT)</a>
<a href="https://uat.effect.clinicedc.org/tz" class="list-group-item">Tanzania (UAT)</a>
</div>
</div>
</div>

<div class="col-sm-2"></div>

</div>
</div>
</body>
</html>
48 changes: 48 additions & 0 deletions bin/nginx/www/uat.effect.clinicedc.org/sa/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<!DOCTYPE html>
<html lang="en">

<head>
<title>EFFECT Trial UAT Sites</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.1.1/css/all.css" integrity="sha384-O8whS3fhG2OnA5Kas0Y9l3cfpmYjapjI0E4theH4iuMD+pLhbf6JI0jIMfYcK3yZ" crossorigin="anonymous">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
</head>

<body>

<div class="jumbotron text-center">
<h2>EFFECT Trial UAT: South Africa</h2>
<p>Select a site to continue</p>
</div>

<div class="container">
<div class="row">
<div class="col-sm-4"></div>
<div class="col-sm-4">
<div class="panel panel-danger">
<div class="panel-heading">EFFECT Trial UAT: South Africa</div>
<div class="list-group">
<a href="https://effect.clinicedc.org/" class="list-group-item"><i class="fas fa-reply fa-fw" aria-hidden="true"></i> Home</a>
<a href="#" class="list-group-item disabled">UCT</a>
<a href="https://capetown.uat.sa.effect.clinicedc.org/" class="list-group-item">Khayelitsha and Mitchell’s Plain Hospital 110</a>
<a href="#" class="list-group-item disabled">UKZN</a>
<a href="https://edendale.uat.sa.effect.clinicedc.org/" class="list-group-item">Edendale Hospital 160</a>
<a href="https://king-edward.uat.sa.effect.clinicedc.org/" class="list-group-item">King Edward VIII Hospital 150</a>
<a href="#" class="list-group-item disabled">Wits</a>
<a href="https://baragwanath.uat.sa.effect.clinicedc.org/" class="list-group-item">Chris Hani Baragwanath Hospital 120</a>
<a href="https://helen-joseph.uat.sa.effect.clinicedc.org/" class="list-group-item">Helen Joseph Hospital 130</a>
<a href="https://klerksdorp.uat.sa.effect.clinicedc.org/" class="list-group-item">Tshepong (Klerksdorp) Hospital 140</a>
<a href="#" class="list-group-item disabled">WSU</a>
<a href="https://livingstone.uat.sa.effect.clinicedc.org/" class="list-group-item">Livingstone (Gqeberha) 170</a>
<a href="https://dora-nginza.uat.sa.effect.clinicedc.org/" class="list-group-item">Dora Nginza (Gqeberha) 180</a>
</div>
</div>
</div>
<div class="col-sm-4"></div>
</div>
</div>
</body>
</html>
Loading

0 comments on commit dca57e4

Please sign in to comment.