You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2022/02/24 09:07:45 UTC
[myfaces-homepage] branch master updated: - error 404 - move setup skript
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-homepage.git
The following commit(s) were added to refs/heads/master by this push:
new ffac0ee - error 404 - move setup skript
ffac0ee is described below
commit ffac0eecbf0e352efbb20b2b6965382e19f91355
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Feb 24 10:07:20 2022 +0100
- error 404
- move setup skript
---
tobago/tobago-vm/apache-proxy/000-default.conf | 2 ++
tobago/tobago-vm/apache-proxy/error-404.html | 42 ++++++++++++++++++++++++++
tobago/{tobago-vm.sh => tobago-vm/setup.sh} | 4 +--
3 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/tobago/tobago-vm/apache-proxy/000-default.conf b/tobago/tobago-vm/apache-proxy/000-default.conf
index 6c92092..b13633d 100644
--- a/tobago/tobago-vm/apache-proxy/000-default.conf
+++ b/tobago/tobago-vm/apache-proxy/000-default.conf
@@ -26,6 +26,8 @@ ServerName tobago-demo.apache.org
ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
+ ErrorDocument 404 /error-404.html
+
# Permanent external links:
Redirect temp /intro.html "/demo-5-snapshot/content/000-intro/intro.xhtml"
Redirect temp /getting-started.html "/demo-5-snapshot/content/000-intro/10-getting-started/Getting-Started.xhtml"
diff --git a/tobago/tobago-vm/apache-proxy/error-404.html b/tobago/tobago-vm/apache-proxy/error-404.html
new file mode 100644
index 0000000..cc2acdc
--- /dev/null
+++ b/tobago/tobago-vm/apache-proxy/error-404.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+ <title>Tobago Demo</title>
+ <link href="bootstrap.min.css" rel="stylesheet">
+ <style>
+ div.disabled {
+ opacity: 0.3;
+ }
+
+ .na {
+ text-align: center;
+ vertical-align: middle;
+ }
+ </style>
+</head>
+<body class="bd-home">
+
+<main class="bd-masthead" id="content" role="main">
+ <div class="container p-5">
+
+ <h1>Not Found</h1>
+ <h3>The requested URL was not found on this server.</h3>
+ <a href="/" class="btn btn-primary">Home</a>
+
+ </div>
+</main>
+
+<div class="container">
+ <footer class="bd-footer text-muted">
+ <div class="container-fluid p-3 p-md-5">
+ <p>© 2005-2022 Apache Software Foundation, Licensed under the <a
+ href="http://www.apache.org/licenses/LICENSE-2.0">
+ Apache License, Version 2.0</a>.</p>
+ </div>
+ </footer>
+</div>
+
+</body>
+</html>
diff --git a/tobago/tobago-vm.sh b/tobago/tobago-vm/setup.sh
similarity index 71%
rename from tobago/tobago-vm.sh
rename to tobago/tobago-vm/setup.sh
index 633dfa8..cc353ec 100755
--- a/tobago/tobago-vm.sh
+++ b/tobago/tobago-vm/setup.sh
@@ -1,7 +1,7 @@
#! /bin/bash
# This script can be called directly like this.
-# curl -s -o /tmp/tobago-vm.sh https://raw.githubusercontent.com/apache/myfaces-homepage/master/tobago/tobago-vm.sh | bash
+# curl -s -f https://raw.githubusercontent.com/apache/myfaces-homepage/master/tobago/tobago-vm/setup.sh | bash
set -e
@@ -20,4 +20,4 @@ cd tobago-vm
# need to wait for Let's encrypt
sleep 20
-/usr/bin/docker exec -it tobago-vm_apache_1 apachectl graceful
+/usr/bin/docker exec tobago-vm_apache_1 apachectl graceful