From 39b1cd27b8bc9d11e3e2f42aad089116d0c0b818 Mon Sep 17 00:00:00 2001
From: Rick Elrod <rick@elrod.me>
Date: Mar 21 2020 10:40:32 +0000
Subject: Add a Dockerfile to make it easy for newcomers and people not on Fedora to build these sites. Fix up dev server to work in the container.


Signed-off-by: Rick Elrod <rick@elrod.me>

---

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..10f8ec9
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,10 @@
+FROM fedora:30
+MAINTAINER Rick Elrod <relrod@redhat.com>
+
+WORKDIR /opt/oldrepo/
+
+RUN  dnf install -y git gettext python-genshi python-lxml python-setuptools \
+     python-dateutil python-dogpile-cache babel python-feedparser fedfind \
+     python-requests python2-babel findutils make httpd
+
+EXPOSE 5000
diff --git a/Makefile.in b/Makefile.in
index 7d4f518..4ec8578 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,6 +96,10 @@ test: 	$(HTTPDDIR)/conf/httpd.conf $(HTTPDDIR)/conf/languages.conf
 	/usr/sbin/httpd -d $(HTTPDDIR) -f conf/httpd.conf
 	@echo "Test instance started at: http://localhost:5000/"
 
+testfg: 	$(HTTPDDIR)/conf/httpd.conf $(HTTPDDIR)/conf/languages.conf
+	@echo "Starting test instance at: http://localhost:5000/"
+	/usr/sbin/httpd -DFOREGROUND -d $(HTTPDDIR) -f conf/httpd.conf
+
 stoptest: clean
 	pid=`cat $(HTTPDDIR)/run/httpd.pid` && \
 	kill -TERM $$pid
diff --git a/httpd/conf/httpd.conf.in b/httpd/conf/httpd.conf.in
index 8de701b..e5d4208 100644
--- a/httpd/conf/httpd.conf.in
+++ b/httpd/conf/httpd.conf.in
@@ -96,11 +96,11 @@ LoadModule speling_module /etc/httpd/modules/mod_speling.so
 LoadModule userdir_module /etc/httpd/modules/mod_userdir.so
 LoadModule alias_module /etc/httpd/modules/mod_alias.so
 LoadModule rewrite_module /etc/httpd/modules/mod_rewrite.so
-LoadModule proxy_module /etc/httpd/modules/mod_proxy.so
-LoadModule proxy_balancer_module /etc/httpd/modules/mod_proxy_balancer.so
-LoadModule proxy_ftp_module /etc/httpd/modules/mod_proxy_ftp.so
-LoadModule proxy_http_module /etc/httpd/modules/mod_proxy_http.so
-LoadModule proxy_connect_module /etc/httpd/modules/mod_proxy_connect.so
+#LoadModule proxy_module /etc/httpd/modules/mod_proxy.so
+#LoadModule proxy_balancer_module /etc/httpd/modules/mod_proxy_balancer.so
+#LoadModule proxy_ftp_module /etc/httpd/modules/mod_proxy_ftp.so
+#LoadModule proxy_http_module /etc/httpd/modules/mod_proxy_http.so
+#LoadModule proxy_connect_module /etc/httpd/modules/mod_proxy_connect.so
 LoadModule cache_module /etc/httpd/modules/mod_cache.so
 LoadModule suexec_module /etc/httpd/modules/mod_suexec.so
 LoadModule cgi_module /etc/httpd/modules/mod_cgi.so