apache: normalize installation (docs and script)s over all distros

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

5 files changed, 44 insertions, 41 deletions

diff --git a/utils/templates/etc/apache2 b/utils/templates/etc/apache2
new file mode 120000
index 000000000..558a90717
--- /dev/null
+++ b/utils/templates/etc/apache2
@@ -0,0 +1 @@
+httpd
\ No newline at end of file
diff --git a/utils/templates/etc/apache2/sites-available/searx.conf:uwsgi b/utils/templates/etc/apache2/sites-available/searx.conf:uwsgi
deleted file mode 100644
index 21e01ac4e..000000000
--- a/utils/templates/etc/apache2/sites-available/searx.conf:uwsgi
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8; mode: apache -*-
-
-<IfModule mod_uwsgi.c>
-
-    # SetEnvIf Request_URI "${SEARX_URL_PATH}" dontlog
-    # CustomLog /dev/null combined env=dontlog
-
-    <Location ${SEARX_URL_PATH}>
-
-        <IfModule mod_security2.c>
-            SecRuleEngine Off
-        </IfModule>
-
-	Require all granted
-
-        Options FollowSymLinks Indexes
-        SetHandler uwsgi-handler
-        uWSGISocket ${SEARX_UWSGI_SOCKET}
-
-        Order deny,allow
-        Deny from all
-        # Allow from fd00::/8 192.168.0.0/16 fe80::/10 127.0.0.0/8 ::1
-        Allow from all
-
-    </Location>
-
-</IfModule>
diff --git a/utils/templates/etc/apache2/sites-available/morty.conf b/utils/templates/etc/httpd/sites-available/morty.conf
index 4421cdd51..326fcc755 100644
--- a/utils/templates/etc/apache2/sites-available/morty.conf
+++ b/utils/templates/etc/httpd/sites-available/morty.conf
@@ -1,6 +1,12 @@
 # -*- coding: utf-8; mode: apache -*-
 
-ProxyPreserveHost On
+LoadModule headers_module       ${APACHE_MODULES}/mod_headers.so
+LoadModule proxy_module         ${APACHE_MODULES}/mod_proxy.so
+LoadModule proxy_module         ${APACHE_MODULES}/mod_proxy_http.so
+#LoadModule setenvif_module      ${APACHE_MODULES}/mod_setenvif.so
+
+# SetEnvIf Request_URI "${PUBLIC_URL_PATH_MORTY}" dontlog
+# CustomLog /dev/null combined env=dontlog
 
 <Location ${PUBLIC_URL_PATH_MORTY} >
 
@@ -15,12 +21,8 @@ ProxyPreserveHost On
     #Allow from fd00::/8 192.168.0.0/16 fe80::/10 127.0.0.0/8 ::1
     Allow from all
 
+    ProxyPreserveHost On
     ProxyPass http://${MORTY_LISTEN}
     RequestHeader set X-Script-Name ${PUBLIC_URL_PATH_MORTY}
 
-    # In Apache it seems, that setting HTTP_HOST header directive here does have
-    # no effect.  I needed to set 'ProxyPreserveHost On' (see above).
-
-    # RequestHeader set Host ${PUBLIC_HOST}
-
 </Location>
diff --git a/utils/templates/etc/apache2/sites-available/searx.conf:filtron b/utils/templates/etc/httpd/sites-available/searx.conf:filtron
index 2d6af7889..11dd360bc 100644
--- a/utils/templates/etc/apache2/sites-available/searx.conf:filtron
+++ b/utils/templates/etc/httpd/sites-available/searx.conf:filtron
@@ -1,6 +1,12 @@
 # -*- coding: utf-8; mode: apache -*-
 
-ProxyPreserveHost On
+LoadModule headers_module       ${APACHE_MODULES}/mod_headers.so
+LoadModule proxy_module         ${APACHE_MODULES}/mod_proxy.so
+LoadModule proxy_module         ${APACHE_MODULES}/mod_proxy_http.so
+#LoadModule setenvif_module      ${APACHE_MODULES}/mod_setenvif.so
+
+# SetEnvIf Request_URI "${FILTRON_URL_PATH}" dontlog
+# CustomLog /dev/null combined env=dontlog
 
 # SecRuleRemoveById 981054
 # SecRuleRemoveById 981059
@@ -20,14 +26,8 @@ ProxyPreserveHost On
     #Allow from fd00::/8 192.168.0.0/16 fe80::/10 127.0.0.0/8 ::1
     Allow from all
 
+    ProxyPreserveHost On
     ProxyPass http://${FILTRON_LISTEN}
     RequestHeader set X-Script-Name ${FILTRON_URL_PATH}
 
-    # In Apache it seems, that setting HTTP_HOST header directive here does have
-    # no effect.  I needed to set 'ProxyPreserveHost On' (see above).  HTTP_HOST
-    # (ProxyPreserveHost On) is needed by searx to render correct *Search URL*
-    # in the *Link* box and *saved preference*.
-
-    # RequestHeader set Host ${PUBLIC_HOST}
-
 </Location>
diff --git a/utils/templates/etc/httpd/sites-available/searx.conf:uwsgi b/utils/templates/etc/httpd/sites-available/searx.conf:uwsgi
new file mode 100644
index 000000000..ef702de3a
--- /dev/null
+++ b/utils/templates/etc/httpd/sites-available/searx.conf:uwsgi
@@ -0,0 +1,27 @@
+# -*- coding: utf-8; mode: apache -*-
+
+LoadModule headers_module       ${APACHE_MODULES}/mod_headers.so
+LoadModule proxy_module         ${APACHE_MODULES}/mod_proxy.so
+LoadModule proxy_uwsgi_module   ${APACHE_MODULES}/mod_proxy_uwsgi.so
+# LoadModule setenvif_module ${APACHE_MODULES}/mod_setenvif.so
+
+# SetEnvIf Request_URI "${SEARX_URL_PATH}" dontlog
+# CustomLog /dev/null combined env=dontlog
+
+<Location ${SEARX_URL_PATH}>
+
+    <IfModule mod_security2.c>
+        SecRuleEngine Off
+    </IfModule>
+
+    Require all granted
+
+    Order deny,allow
+    Deny from all
+    # Allow from fd00::/8 192.168.0.0/16 fe80::/10 127.0.0.0/8 ::1
+    Allow from all
+
+    ProxyPreserveHost On
+    ProxyPass unix:${SEARX_UWSGI_SOCKET}|uwsgi://uwsgi-uds-searx/
+
+</Location>