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 08:40:21 UTC
[myfaces-homepage] branch master updated: feat: update httpd
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 c5d840f feat: update httpd
c5d840f is described below
commit c5d840f1564276e1394f2d8c9cdf50e4f6a8fef1
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Thu Feb 24 09:39:04 2022 +0100
feat: update httpd
- dist bullseye
- remove unused proxies
---
tobago/tobago-vm/apache-proxy/000-default.conf | 121 +++++++++++++------------
tobago/tobago-vm/apache-proxy/001-ssl.conf | 121 +++++++++++++------------
tobago/tobago-vm/apache-proxy/Dockerfile | 10 +-
3 files changed, 125 insertions(+), 127 deletions(-)
diff --git a/tobago/tobago-vm/apache-proxy/000-default.conf b/tobago/tobago-vm/apache-proxy/000-default.conf
index 81235fd..3abcda0 100644
--- a/tobago/tobago-vm/apache-proxy/000-default.conf
+++ b/tobago/tobago-vm/apache-proxy/000-default.conf
@@ -44,15 +44,15 @@ ServerName tobago-demo.apache.org
ProxyPassReverse "http://demo-5-release:8080/demo-5-release/"
</Location>
- <Location /demo-5-staging/>
- ProxyPass "http://demo-5-staging:8080/demo-5-staging/"
- ProxyPassReverse "http://demo-5-staging:8080/demo-5-staging/"
- </Location>
+# <Location /demo-5-staging/>
+# ProxyPass "http://demo-5-staging:8080/demo-5-staging/"
+# ProxyPassReverse "http://demo-5-staging:8080/demo-5-staging/"
+# </Location>
- <Location /demo-5-snapshot/>
- ProxyPass "http://demo-5-snapshot:8080/demo-5-snapshot/"
- ProxyPassReverse "http://demo-5-snapshot:8080/demo-5-snapshot/"
- </Location>
+# <Location /demo-5-snapshot/>
+# ProxyPass "http://demo-5-snapshot:8080/demo-5-snapshot/"
+# ProxyPassReverse "http://demo-5-snapshot:8080/demo-5-snapshot/"
+# </Location>
# 4
@@ -61,32 +61,32 @@ ServerName tobago-demo.apache.org
ProxyPassReverse "http://demo-4-release:8080/demo-4-release/"
</Location>
- <Location /demo-4-staging/>
- ProxyPass "http://demo-4-staging:8080/demo-4-staging/"
- ProxyPassReverse "http://demo-4-staging:8080/demo-4-staging/"
- </Location>
+# <Location /demo-4-staging/>
+# ProxyPass "http://demo-4-staging:8080/demo-4-staging/"
+# ProxyPassReverse "http://demo-4-staging:8080/demo-4-staging/"
+# </Location>
- <Location /demo-4-snapshot/>
- ProxyPass "http://demo-4-snapshot:8080/demo-4-snapshot/"
- ProxyPassReverse "http://demo-4-snapshot:8080/demo-4-snapshot/"
- </Location>
+# <Location /demo-4-snapshot/>
+# ProxyPass "http://demo-4-snapshot:8080/demo-4-snapshot/"
+# ProxyPassReverse "http://demo-4-snapshot:8080/demo-4-snapshot/"
+# </Location>
# 3
- <Location /demo-3-release/>
- ProxyPass "http://demo-3-release:8080/demo-3-release/"
- ProxyPassReverse "http://demo-3-release:8080/demo-3-release/"
- </Location>
+# <Location /demo-3-release/>
+# ProxyPass "http://demo-3-release:8080/demo-3-release/"
+# ProxyPassReverse "http://demo-3-release:8080/demo-3-release/"
+# </Location>
- <Location /demo-3-staging/>
- ProxyPass "http://demo-3-staging:8080/demo-3-staging/"
- ProxyPassReverse "http://demo-3-staging:8080/demo-3-staging/"
- </Location>
+# <Location /demo-3-staging/>
+# ProxyPass "http://demo-3-staging:8080/demo-3-staging/"
+# ProxyPassReverse "http://demo-3-staging:8080/demo-3-staging/"
+# </Location>
- <Location /demo-3-snapshot/>
- ProxyPass "http://demo-3-snapshot:8080/demo-3-snapshot/"
- ProxyPassReverse "http://demo-3-snapshot:8080/demo-3-snapshot/"
- </Location>
+# <Location /demo-3-snapshot/>
+# ProxyPass "http://demo-3-snapshot:8080/demo-3-snapshot/"
+# ProxyPassReverse "http://demo-3-snapshot:8080/demo-3-snapshot/"
+# </Location>
# 2
@@ -95,47 +95,48 @@ ServerName tobago-demo.apache.org
ProxyPassReverse "http://demo-2-release:8080/demo-2-release/"
</Location>
- <Location /demo-2-staging/>
- ProxyPass "http://demo-2-staging:8080/demo-2-staging/"
- ProxyPassReverse "http://demo-2-staging:8080/demo-2-staging/"
- </Location>
+# <Location /demo-2-staging/>
+# ProxyPass "http://demo-2-staging:8080/demo-2-staging/"
+# ProxyPassReverse "http://demo-2-staging:8080/demo-2-staging/"
+# </Location>
- <Location /demo-2-snapshot/>
- ProxyPass "http://demo-2-snapshot:8080/demo-2-snapshot/"
- ProxyPassReverse "http://demo-2-snapshot:8080/demo-2-snapshot/"
- </Location>
+# <Location /demo-2-snapshot/>
+# ProxyPass "http://demo-2-snapshot:8080/demo-2-snapshot/"
+# ProxyPassReverse "http://demo-2-snapshot:8080/demo-2-snapshot/"
+# </Location>
# 1.5
- <Location /demo-1-5-release/>
- ProxyPass "http://demo-1-5-release:8080/demo-1-5-release/"
- ProxyPassReverse "http://demo-1-5-release:8080/demo-1-5-release/"
- </Location>
+# <Location /demo-1-5-release/>
+# ProxyPass "http://demo-1-5-release:8080/demo-1-5-release/"
+# ProxyPassReverse "http://demo-1-5-release:8080/demo-1-5-release/"
+# </Location>
- <Location /demo-1-5-staging/>
- ProxyPass "http://demo-1-5-staging:8080/demo-1-5-staging/"
- ProxyPassReverse "http://demo-1-5-staging:8080/demo-1-5-staging/"
- </Location>
+# <Location /demo-1-5-staging/>
+# ProxyPass "http://demo-1-5-staging:8080/demo-1-5-staging/"
+# ProxyPassReverse "http://demo-1-5-staging:8080/demo-1-5-staging/"
+# </Location>
- <Location /demo-1-5-snapshot/>
- ProxyPass "http://demo-1-5-snapshot:8080/demo-1-5-snapshot/"
- ProxyPassReverse "http://demo-1-5-snapshot:8080/demo-1-5-snapshot/"
- </Location>
+# <Location /demo-1-5-snapshot/>
+# ProxyPass "http://demo-1-5-snapshot:8080/demo-1-5-snapshot/"
+# ProxyPassReverse "http://demo-1-5-snapshot:8080/demo-1-5-snapshot/"
+# </Location>
# 1.0
- <Location /demo-1-0-release/>
- ProxyPass "http://demo-1-0-release:8080/demo-1-0-release/"
- ProxyPassReverse "http://demo-1-0-release:8080/demo-1-0-release/"
- </Location>
- <Location /demo-1-0-staging/>
- ProxyPass "http://demo-1-0-staging:8080/demo-1-0-staging/"
- ProxyPassReverse "http://demo-1-0-staging:8080/demo-1-0-staging/"
- </Location>
+# <Location /demo-1-0-release/>
+# ProxyPass "http://demo-1-0-release:8080/demo-1-0-release/"
+# ProxyPassReverse "http://demo-1-0-release:8080/demo-1-0-release/"
+# </Location>
- <Location /demo-1-0-snapshot/>
- ProxyPass "http://demo-1-0-snapshot:8080/demo-1-0-snapshot/"
- ProxyPassReverse "http://demo-1-0-snapshot:8080/demo-1-0-snapshot/"
- </Location>
+# <Location /demo-1-0-staging/>
+# ProxyPass "http://demo-1-0-staging:8080/demo-1-0-staging/"
+# ProxyPassReverse "http://demo-1-0-staging:8080/demo-1-0-staging/"
+# </Location>
+
+# <Location /demo-1-0-snapshot/>
+# ProxyPass "http://demo-1-0-snapshot:8080/demo-1-0-snapshot/"
+# ProxyPassReverse "http://demo-1-0-snapshot:8080/demo-1-0-snapshot/"
+# </Location>
</VirtualHost>
diff --git a/tobago/tobago-vm/apache-proxy/001-ssl.conf b/tobago/tobago-vm/apache-proxy/001-ssl.conf
index a38d84b..4cc5ee2 100644
--- a/tobago/tobago-vm/apache-proxy/001-ssl.conf
+++ b/tobago/tobago-vm/apache-proxy/001-ssl.conf
@@ -50,15 +50,15 @@ MDomain tobago-demo.apache.org
ProxyPassReverse "http://demo-5-release:8080/demo-5-release/"
</Location>
- <Location /demo-5-staging/>
- ProxyPass "http://demo-5-staging:8080/demo-5-staging/"
- ProxyPassReverse "http://demo-5-staging:8080/demo-5-staging/"
- </Location>
+# <Location /demo-5-staging/>
+# ProxyPass "http://demo-5-staging:8080/demo-5-staging/"
+# ProxyPassReverse "http://demo-5-staging:8080/demo-5-staging/"
+# </Location>
- <Location /demo-5-snapshot/>
- ProxyPass "http://demo-5-snapshot:8080/demo-5-snapshot/"
- ProxyPassReverse "http://demo-5-snapshot:8080/demo-5-snapshot/"
- </Location>
+# <Location /demo-5-snapshot/>
+# ProxyPass "http://demo-5-snapshot:8080/demo-5-snapshot/"
+# ProxyPassReverse "http://demo-5-snapshot:8080/demo-5-snapshot/"
+# </Location>
# 4
@@ -67,32 +67,32 @@ MDomain tobago-demo.apache.org
ProxyPassReverse "http://demo-4-release:8080/demo-4-release/"
</Location>
- <Location /demo-4-staging/>
- ProxyPass "http://demo-4-staging:8080/demo-4-staging/"
- ProxyPassReverse "http://demo-4-staging:8080/demo-4-staging/"
- </Location>
+# <Location /demo-4-staging/>
+# ProxyPass "http://demo-4-staging:8080/demo-4-staging/"
+# ProxyPassReverse "http://demo-4-staging:8080/demo-4-staging/"
+# </Location>
- <Location /demo-4-snapshot/>
- ProxyPass "http://demo-4-snapshot:8080/demo-4-snapshot/"
- ProxyPassReverse "http://demo-4-snapshot:8080/demo-4-snapshot/"
- </Location>
+# <Location /demo-4-snapshot/>
+# ProxyPass "http://demo-4-snapshot:8080/demo-4-snapshot/"
+# ProxyPassReverse "http://demo-4-snapshot:8080/demo-4-snapshot/"
+# </Location>
# 3
- <Location /demo-3-release/>
- ProxyPass "http://demo-3-release:8080/demo-3-release/"
- ProxyPassReverse "http://demo-3-release:8080/demo-3-release/"
- </Location>
+# <Location /demo-3-release/>
+# ProxyPass "http://demo-3-release:8080/demo-3-release/"
+# ProxyPassReverse "http://demo-3-release:8080/demo-3-release/"
+# </Location>
- <Location /demo-3-staging/>
- ProxyPass "http://demo-3-staging:8080/demo-3-staging/"
- ProxyPassReverse "http://demo-3-staging:8080/demo-3-staging/"
- </Location>
+# <Location /demo-3-staging/>
+# ProxyPass "http://demo-3-staging:8080/demo-3-staging/"
+# ProxyPassReverse "http://demo-3-staging:8080/demo-3-staging/"
+# </Location>
- <Location /demo-3-snapshot/>
- ProxyPass "http://demo-3-snapshot:8080/demo-3-snapshot/"
- ProxyPassReverse "http://demo-3-snapshot:8080/demo-3-snapshot/"
- </Location>
+# <Location /demo-3-snapshot/>
+# ProxyPass "http://demo-3-snapshot:8080/demo-3-snapshot/"
+# ProxyPassReverse "http://demo-3-snapshot:8080/demo-3-snapshot/"
+# </Location>
# 2
@@ -101,47 +101,48 @@ MDomain tobago-demo.apache.org
ProxyPassReverse "http://demo-2-release:8080/demo-2-release/"
</Location>
- <Location /demo-2-staging/>
- ProxyPass "http://demo-2-staging:8080/demo-2-staging/"
- ProxyPassReverse "http://demo-2-staging:8080/demo-2-staging/"
- </Location>
+# <Location /demo-2-staging/>
+# ProxyPass "http://demo-2-staging:8080/demo-2-staging/"
+# ProxyPassReverse "http://demo-2-staging:8080/demo-2-staging/"
+# </Location>
- <Location /demo-2-snapshot/>
- ProxyPass "http://demo-2-snapshot:8080/demo-2-snapshot/"
- ProxyPassReverse "http://demo-2-snapshot:8080/demo-2-snapshot/"
- </Location>
+# <Location /demo-2-snapshot/>
+# ProxyPass "http://demo-2-snapshot:8080/demo-2-snapshot/"
+# ProxyPassReverse "http://demo-2-snapshot:8080/demo-2-snapshot/"
+# </Location>
# 1.5
- <Location /demo-1-5-release/>
- ProxyPass "http://demo-1-5-release:8080/demo-1-5-release/"
- ProxyPassReverse "http://demo-1-5-release:8080/demo-1-5-release/"
- </Location>
+# <Location /demo-1-5-release/>
+# ProxyPass "http://demo-1-5-release:8080/demo-1-5-release/"
+# ProxyPassReverse "http://demo-1-5-release:8080/demo-1-5-release/"
+# </Location>
- <Location /demo-1-5-staging/>
- ProxyPass "http://demo-1-5-staging:8080/demo-1-5-staging/"
- ProxyPassReverse "http://demo-1-5-staging:8080/demo-1-5-staging/"
- </Location>
+# <Location /demo-1-5-staging/>
+# ProxyPass "http://demo-1-5-staging:8080/demo-1-5-staging/"
+# ProxyPassReverse "http://demo-1-5-staging:8080/demo-1-5-staging/"
+# </Location>
- <Location /demo-1-5-snapshot/>
- ProxyPass "http://demo-1-5-snapshot:8080/demo-1-5-snapshot/"
- ProxyPassReverse "http://demo-1-5-snapshot:8080/demo-1-5-snapshot/"
- </Location>
+# <Location /demo-1-5-snapshot/>
+# ProxyPass "http://demo-1-5-snapshot:8080/demo-1-5-snapshot/"
+# ProxyPassReverse "http://demo-1-5-snapshot:8080/demo-1-5-snapshot/"
+# </Location>
# 1.0
- <Location /demo-1-0-release/>
- ProxyPass "http://demo-1-0-release:8080/demo-1-0-release/"
- ProxyPassReverse "http://demo-1-0-release:8080/demo-1-0-release/"
- </Location>
- <Location /demo-1-0-staging/>
- ProxyPass "http://demo-1-0-staging:8080/demo-1-0-staging/"
- ProxyPassReverse "http://demo-1-0-staging:8080/demo-1-0-staging/"
- </Location>
+# <Location /demo-1-0-release/>
+# ProxyPass "http://demo-1-0-release:8080/demo-1-0-release/"
+# ProxyPassReverse "http://demo-1-0-release:8080/demo-1-0-release/"
+# </Location>
- <Location /demo-1-0-snapshot/>
- ProxyPass "http://demo-1-0-snapshot:8080/demo-1-0-snapshot/"
- ProxyPassReverse "http://demo-1-0-snapshot:8080/demo-1-0-snapshot/"
- </Location>
+# <Location /demo-1-0-staging/>
+# ProxyPass "http://demo-1-0-staging:8080/demo-1-0-staging/"
+# ProxyPassReverse "http://demo-1-0-staging:8080/demo-1-0-staging/"
+# </Location>
+
+# <Location /demo-1-0-snapshot/>
+# ProxyPass "http://demo-1-0-snapshot:8080/demo-1-0-snapshot/"
+# ProxyPassReverse "http://demo-1-0-snapshot:8080/demo-1-0-snapshot/"
+# </Location>
</VirtualHost>
diff --git a/tobago/tobago-vm/apache-proxy/Dockerfile b/tobago/tobago-vm/apache-proxy/Dockerfile
index 5336410..69962fd 100644
--- a/tobago/tobago-vm/apache-proxy/Dockerfile
+++ b/tobago/tobago-vm/apache-proxy/Dockerfile
@@ -13,22 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM debian:buster-slim
-
-RUN echo "deb http://deb.debian.org/debian buster-backports main" >/etc/apt/sources.list.d/buster-backports.list
+FROM debian:bullseye-slim
RUN apt-get update \
&& apt-get upgrade -y \
- && apt-get install -y less vim \
- && apt-get install -y -t buster-backports apache2 \
+ && apt-get install -y apache2 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN a2enmod proxy proxy_http ssl md
COPY 000-default.conf 001-ssl.conf /etc/apache2/sites-enabled/
-COPY *.html /var/www/html/
-COPY *.css *.css.map /var/www/html/
+COPY *.html *.css *.css.map /var/www/html/
ENV APACHE_RUN_USER www-data
ENV APACHE_RUN_GROUP www-data