From 478ec305800eaa11a8a9de5d467598bdb59edc55 Mon Sep 17 00:00:00 2001
From: "Suren A. Chilingaryan" <csa@suren.me>
Date: Thu, 12 Apr 2018 21:31:29 +0200
Subject: Follow Apache 2.4 configuration style

---
 adei/configs/apache.conf   | 56 +++++++++++++++++++++++++++++-----------------
 adei/configs/apache.passwd |  1 -
 adei/configs/passwd.admin  |  1 +
 adei/configs/passwd.user   |  1 +
 4 files changed, 38 insertions(+), 21 deletions(-)
 delete mode 100644 adei/configs/apache.passwd
 create mode 100644 adei/configs/passwd.admin
 create mode 100644 adei/configs/passwd.user

diff --git a/adei/configs/apache.conf b/adei/configs/apache.conf
index 5ea312d..87e3c87 100644
--- a/adei/configs/apache.conf
+++ b/adei/configs/apache.conf
@@ -1,25 +1,41 @@
 <Location /adei/admin/>
-    AuthType		Basic
-    AuthName		"ADEI/Admin Authentication"
-    AuthBasicProvider	file
-    AuthUserFile	/adei/cfg/apache.passwd
-    Require		valid-user
-    Order		deny,allow
-    Deny		from all
-    Allow		from 127.0.0.1
-    Allow		from ::1
-    Satisfy		Any
+    AuthType            Basic
+    AuthName            "ADEI/Admin Authentication"
+    AuthBasicProvider   file
+    AuthUserFile        /adei/cfg/passwd.admin
+    <RequireAny>
+        Require         valid-user
+        Require         ip 127.0.0.1
+        Require         ip ::1
+    </RequireAny>
 </Location>
 
 <Location /adei/services/control.php>
-    AuthType		Basic
-    AuthName		"ADEI/Control Authentication"
-    AuthBasicProvider	file
-    AuthUserFile	/adei/cfg/apache.passwd
-    Require		valid-user
-    Order		deny,allow
-    Deny		from all
-    Allow		from 127.0.0.1
-    Allow		from ::1
-    Satisfy		Any
+    AuthType            Basic
+    AuthName            "ADEI/Control Authentication"
+    AuthBasicProvider   file
+    AuthUserFile        /adei/cfg/passwd.admin
+    <RequireAny>
+        Require         valid-user
+        Require         ip 127.0.0.1
+        Require         ip ::1
+    </RequireAny>
+</Location>
+
+<Location /adei/>
+    SetEnvIf Request_URI "adei/probe\.php$"  health_check
+    SetEnvIf Request_URI "adei/services/sched\.php"  service
+
+    AuthType            Basic
+    AuthName            "ADEI Authentication"
+    AuthBasicProvider   file
+    AuthUserFile        /adei/cfg/passwd.user
+    <RequireAny>
+        Require         all granted
+        Require         valid-user
+        Require         env health_check
+        Require         env service
+        Require        ip 127.0.0.1
+        Require        ip ::1
+    </RequireAny>
 </Location>
diff --git a/adei/configs/apache.passwd b/adei/configs/apache.passwd
deleted file mode 100644
index 1a7a4bb..0000000
--- a/adei/configs/apache.passwd
+++ /dev/null
@@ -1 +0,0 @@
-adei:$apr1$CmdT4hVc$GIf7BaO/POJn8b5GgkR6K/
diff --git a/adei/configs/passwd.admin b/adei/configs/passwd.admin
new file mode 100644
index 0000000..1a7a4bb
--- /dev/null
+++ b/adei/configs/passwd.admin
@@ -0,0 +1 @@
+adei:$apr1$CmdT4hVc$GIf7BaO/POJn8b5GgkR6K/
diff --git a/adei/configs/passwd.user b/adei/configs/passwd.user
new file mode 100644
index 0000000..1a7a4bb
--- /dev/null
+++ b/adei/configs/passwd.user
@@ -0,0 +1 @@
+adei:$apr1$CmdT4hVc$GIf7BaO/POJn8b5GgkR6K/
-- 
cgit v1.2.3