Merge branch 'main' into bugfix/fix-nginx-config-for-auth-endpoint

ls1intum · Jun 23, 2022 · 6a9f364 · 6a9f364
2 parents c4d443b + e2c914d
commit 6a9f364
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 17 deletions.
diff --git a/roles/db_backup/README.md b/roles/db_backup/README.md
@@ -0,0 +1,15 @@
+# DB Backup 
+
+This role adds an cron job to the db host which creates regular DB backups.
+
+## Configuration 
+The default configuration will create a DB backup every day at 4:30: 
+
+```yml 
+artemis_database_dbname: artemis
+artemis_database_backup_dir: /opt/backup
+artemis_database_backup_script_path: /opt/backup.sh
+
+artemis_database_backup_minute: 30
+artemis_database_backup_hour: 4
+```
diff --git a/roles/proxy/files/nginx_502.html b/roles/proxy/files/nginx_502.html
@@ -1,22 +1,26 @@
 <!-- ansible-managed -->
-
 <!DOCTYPE html>
-<html>
-<head>
-<title>Artemis is currently unavailable.</title>
+<html lang="en">
+<title>Artemis Maintenance</title>
+<link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet">
 <style>
-    body {
-        width: 40em;
-        margin: 0 auto;
-        font-family: Tahoma, Verdana, Arial, sans-serif;
-    }
+  html, body { padding: 0; margin: 0; width: 100%; height: 100%; }
+  * {box-sizing: border-box;}
+  body { text-align: center; padding: 0; background: #353d47; color: #fff; font-family: Open Sans; }
+  h1 { font-size: 50px; font-weight: 100; text-align: center;}
+  body { font-family: Open Sans; font-weight: 100; font-size: 20px; color: #fff; text-align: center; display: -webkit-box; display: -ms-flexbox; display: flex; -webkit-box-pack: center; -ms-flex-pack: center; justify-content: center; -webkit-box-align: center; -ms-flex-align: center; align-items: center;}
+  article { display: block; width: 700px; padding: 50px; margin: 0 auto; }
+  a { color: #fff; font-weight: bold;}
+  a:hover { text-decoration: none; }
+  svg { width: 75px; margin-top: 1em; }
 </style>
-</head>
-<body>
-    <h1>Sorry, Artemis is currently unavailable.</h1>
-    <p>Please try again later.</p>
-    <p><em>The Artemis Team.</em></p>
-    <p></p>
-    <p>If this error persists, please contact us via email at <tt>artemis [dot] in [at] tum [dot] de</tt>.</p>
-</body>
+
+<article>
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 202.24 202.24"><defs><style>.cls-1{fill:#fff;}</style></defs><title>Asset 3</title><g id="Layer_2" data-name="Layer 2"><g id="Capa_1" data-name="Capa 1"><path class="cls-1" d="M101.12,0A101.12,101.12,0,1,0,202.24,101.12,101.12,101.12,0,0,0,101.12,0ZM159,148.76H43.28a11.57,11.57,0,0,1-10-17.34L91.09,31.16a11.57,11.57,0,0,1,20.06,0L169,131.43a11.57,11.57,0,0,1-10,17.34Z"/><path class="cls-1" d="M101.12,36.93h0L43.27,137.21H159L101.13,36.94Zm0,88.7a7.71,7.71,0,1,1,7.71-7.71A7.71,7.71,0,0,1,101.12,125.63Zm7.71-50.13a7.56,7.56,0,0,1-.11,1.3l-3.8,22.49a3.86,3.86,0,0,1-7.61,0l-3.8-22.49a8,8,0,0,1-.11-1.3,7.71,7.71,0,1,1,15.43,0Z"/></g></g></svg>
+    <h1>We&rsquo;ll be back soon!</h1>
+    <div>
+        <p>We&rsquo;re performing some maintenance at the moment. Sorry for the inconvenience.</p>
+        <p>&mdash; Your Artemis Administrators</p>
+    </div>
+</article>
 </html>