From ee39a098acb2386abd5382de5c9476cc4ffe2e03 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 7 Apr 2020 18:31:51 +0200
Subject: apache: normalize installation (docs and script)s over all distros

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/templates/etc/apache2                        |  1 +
 .../etc/apache2/sites-available/morty.conf         | 26 -----------------
 .../etc/apache2/sites-available/searx.conf:filtron | 33 ----------------------
 .../etc/apache2/sites-available/searx.conf:uwsgi   | 27 ------------------
 4 files changed, 1 insertion(+), 86 deletions(-)
 create mode 120000 utils/templates/etc/apache2
 delete mode 100644 utils/templates/etc/apache2/sites-available/morty.conf
 delete mode 100644 utils/templates/etc/apache2/sites-available/searx.conf:filtron
 delete mode 100644 utils/templates/etc/apache2/sites-available/searx.conf:uwsgi

(limited to 'utils/templates/etc/apache2')

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/morty.conf b/utils/templates/etc/apache2/sites-available/morty.conf
deleted file mode 100644
index 4421cdd51..000000000
--- a/utils/templates/etc/apache2/sites-available/morty.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# -*- coding: utf-8; mode: apache -*-
-
-ProxyPreserveHost On
-
-<Location ${PUBLIC_URL_PATH_MORTY} >
-
-    <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
-
-    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/apache2/sites-available/searx.conf:filtron
deleted file mode 100644
index 2d6af7889..000000000
--- a/utils/templates/etc/apache2/sites-available/searx.conf:filtron
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8; mode: apache -*-
-
-ProxyPreserveHost On
-
-# SecRuleRemoveById 981054
-# SecRuleRemoveById 981059
-# SecRuleRemoveById 981060
-# SecRuleRemoveById 950907
-
-<Location ${FILTRON_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
-
-    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/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>
-- 
cgit v1.2.3