[damned-lies/oscp] Add httpd image



commit 13741c27b3413834b88952cfd29291bd08c8e263
Author: Bartłomiej Piotrowski <bpiotrowski gnome org>
Date:   Mon Mar 23 16:59:01 2020 +0100

    Add httpd image

 httpd/Dockerfile                                        | 8 ++++++++
 {uwsgi => httpd/app_data/httpd-cfg}/l10n.gnome.org.conf | 9 ++-------
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/httpd/Dockerfile b/httpd/Dockerfile
new file mode 100644
index 00000000..44c0bf81
--- /dev/null
+++ b/httpd/Dockerfile
@@ -0,0 +1,8 @@
+FROM centos/httpd-24-centos7
+USER root
+
+COPY app_data /opt/app-root/src
+
+EXPOSE 8080
+
+ENTRYPOINT ["/usr/bin/run-httpd"]
diff --git a/uwsgi/l10n.gnome.org.conf b/httpd/app_data/httpd-cfg/l10n.gnome.org.conf
similarity index 80%
rename from uwsgi/l10n.gnome.org.conf
rename to httpd/app_data/httpd-cfg/l10n.gnome.org.conf
index f26e7451..4fef1b51 100644
--- a/uwsgi/l10n.gnome.org.conf
+++ b/httpd/app_data/httpd-cfg/l10n.gnome.org.conf
@@ -10,13 +10,8 @@ WSGIRestrictStdout Off
     Alias /media /var/www/djamnedlies/data/media
     Alias /robots.txt /l10n/damnedlies/static/robots.txt
 
-    # mod_wsgi
-    WSGIApplicationGroup %{GLOBAL}
-    WSGIDaemonProcess l10n display-name=%{GROUP} processes=1 threads=3 home=/l10n python-home=/l10n/venv 
python-path=/l10n/damnedlies user=l10n group=l10n
-    WSGIProcessGroup l10n
-    WSGIScriptAlias / /l10n/damnedlies/damnedlies/wsgi.py
-    LogLevel debug
-    TimeOut 600
+    ProxyPass / http://uwsgi.damned-lies.svc.cluster.local:8000
+    ProxyPassReverse / http://uwsgi.damned-lies.svc.cluster.local:8000
 
     # Map .po and .pot files accordingly to the correct Content-Type,
     # and also make sure they are rendered as utf-8.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]