Apache updates.

This commit is contained in:
Darren 'Tadgy' Austin 2026-04-16 14:13:12 +00:00
commit 3b415b95ed
6 changed files with 348 additions and 293 deletions

View file

@ -1,9 +1,30 @@
<Directory />
AuthType Basic
AuthName "Slackware UK Admins' Portal"
<IfModule authnz_ldap_module>
AuthBasicProvider ldap
AuthLDAPBindDN AnonBind@slackware.uk.internal
AuthLDAPBindPassword "Anonymous Bind"
AuthLDAPURL ldap://core.slackware.uk.internal/cn=Users,dc=slackware,dc=uk,dc=internal?sAMAccountName?sub?(objectClass=*)
</IfModule>
<IfModule ldap_module>
LDAPTrustedClientCert CERT_BASE64 /etc/certificates/core.slackware.uk.internal_cert.pem
</IfModule>
</Directory>
#<Directory /opt/gitrepos/vaelyria.git/>
# Require ldap-group cn=Admin Portal,cn=Users,dc=slackware,dc=uk,dc=internal
#</Directory>
<Directory /usr/share/dokuwiki/>
Options +FollowSymLinks
AllowOverride All
Require all granted
<IfModule mod_rewrite.c>
Require ldap-group cn=Admin Portal,cn=Users,dc=slackware,dc=uk,dc=internal
<IfModule rewrite_module>
RewriteEngine On
RewriteBase //wiki
RewriteRule ^lib - [L]
@ -21,28 +42,17 @@
Require all denied
</Directory>
<Directory /usr/share/fusiondirectory/html/>
Options FollowSymLinks
AllowOverride None
Require all granted
AddType application/wasm .wasm
IncludeOptional /etc/fusiondirectory/fusiondirectory.secrets
</Directory>
<Directory /usr/share/javascript/>
Options FollowSymLinks
AllowOverride None
Require all granted
</Directory>
<Directory /usr/share/phpldapadmin/htdocs/>
Options FollowSymlinks
AllowOverride None
Require all granted
Require ldap-group cn=Admin Portal,cn=Users,dc=slackware,dc=uk,dc=internal
</Directory>
<DirectoryMatch ^/data/sites/core.slackware.uk.net/(cgi-bin|html)/>
Require ldap-group cn=Admin Portal,cn=Users,dc=slackware,dc=uk,dc=internal
</DirectoryMatch>
<VirtualHost 5.101.171.215:80 [2a01:a500:2981:1::d7]:80>
ServerName core.slackware.uk.net
@ -69,20 +79,44 @@
DocumentRoot /data/sites/core.slackware.uk.net/html
Alias /fd /usr/share/fusiondirectory/html
Alias /javascript /usr/share/javascript
Alias /pla /usr/share/phpldapadmin/htdocs
Alias /wiki /usr/share/dokuwiki/
AliasMatch ^/wiki/sites/[^/]+$ /usr/share/dokuwiki/
AliasMatch ^/wiki/sites/[^/]+/(.*)$ /usr/share/dokuwiki/$1
<Proxy *>
Require all granted
</Proxy>
# Dot NOT add backslashes to the end of the urls.
ProxyPass /prometheus http://127.0.0.1:9090
ProxyPassReverse /prometheus http://127.0.0.1:9090
ProxyPass /ts http://127.0.0.1:9200
ProxyPassReverse /ts http://127.0.0.1:9200
# <IfModule wsgi_module>
# WSGIDaemonProcess vaelyria python-home=/opt/venvs/vaelyria
# WSGIProcessGroup vaelyria
# WSGIApplicationGroup %{GLOBAL}
# WSGIScriptAlias /vaelyria /opt/gitrepos/vaelyria.git/app.py
# </IfModule>
<IfModule proxy_module>
<Proxy *>
AuthType Basic
AuthName "Slackware UK Admins' Portal"
Require valid-user
<IfModule authnz_ldap_module>
AuthBasicProvider ldap
AuthLDAPBindDN AnonBind@slackware.uk.internal
AuthLDAPBindPassword "Anonymous Bind"
AuthLDAPURL ldap://core.slackware.uk.internal/cn=Users,dc=slackware,dc=uk,dc=internal?sAMAccountName?sub?(objectClass=*)
</IfModule>
<IfModule ldap_module>
LDAPTrustedClientCert CERT_BASE64 /etc/certificates/core.slackware.uk.internal_cert.pem
</IfModule>
</Proxy>
<IfModule proxy_http_module>
# Note: Dot not add backslashes to the end of the urls.
ProxyPass /prometheus http://127.0.0.1:9090
ProxyPassReverse /prometheus http://127.0.0.1:9090
ProxyPass /ts http://127.0.0.1:9200
ProxyPassReverse /ts http://127.0.0.1:9200
</IfModule>
</IfModule>
</VirtualHost>
</IfModule>