summaryrefslogtreecommitdiffstats
path: root/adei/configs
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2018-04-12 21:31:29 +0200
committerSuren A. Chilingaryan <csa@suren.me>2018-04-12 21:31:29 +0200
commit478ec305800eaa11a8a9de5d467598bdb59edc55 (patch)
tree9bf299cce07ed40928869e87b09240c5d6487603 /adei/configs
parent2b3959be03480c80b686eadaa90fd72fac93a375 (diff)
downloadadei-478ec305800eaa11a8a9de5d467598bdb59edc55.tar.gz
adei-478ec305800eaa11a8a9de5d467598bdb59edc55.tar.bz2
adei-478ec305800eaa11a8a9de5d467598bdb59edc55.tar.xz
adei-478ec305800eaa11a8a9de5d467598bdb59edc55.zip
Follow Apache 2.4 configuration style
Diffstat (limited to 'adei/configs')
-rw-r--r--adei/configs/apache.conf56
-rw-r--r--adei/configs/passwd.admin (renamed from adei/configs/apache.passwd)0
-rw-r--r--adei/configs/passwd.user1
3 files changed, 37 insertions, 20 deletions
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/passwd.admin
index 1a7a4bb..1a7a4bb 100644
--- a/adei/configs/apache.passwd
+++ b/adei/configs/passwd.admin
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/