Mediawiki: updated for Apache 2.4
This commit is contained in:
parent
fd27bc85be
commit
1dd53cc990
@ -4,6 +4,17 @@ with lib;
|
|||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
|
httpd = serverInfo.serverConfig.package;
|
||||||
|
|
||||||
|
version24 = !versionOlder httpd.version "2.4";
|
||||||
|
|
||||||
|
allGranted = if version24 then ''
|
||||||
|
Require all granted
|
||||||
|
'' else ''
|
||||||
|
Order allow,deny
|
||||||
|
Allow from all
|
||||||
|
'';
|
||||||
|
|
||||||
mediawikiConfig = pkgs.writeText "LocalSettings.php"
|
mediawikiConfig = pkgs.writeText "LocalSettings.php"
|
||||||
''
|
''
|
||||||
<?php
|
<?php
|
||||||
@ -121,8 +132,7 @@ in
|
|||||||
Alias ${config.urlPrefix}/images ${config.uploadDir}
|
Alias ${config.urlPrefix}/images ${config.uploadDir}
|
||||||
|
|
||||||
<Directory ${config.uploadDir}>
|
<Directory ${config.uploadDir}>
|
||||||
Order allow,deny
|
${allGranted}
|
||||||
Allow from all
|
|
||||||
Options -Indexes
|
Options -Indexes
|
||||||
</Directory>
|
</Directory>
|
||||||
''}
|
''}
|
||||||
@ -142,8 +152,7 @@ in
|
|||||||
''}
|
''}
|
||||||
|
|
||||||
<Directory ${mediawikiRoot}>
|
<Directory ${mediawikiRoot}>
|
||||||
Order allow,deny
|
${allGranted}
|
||||||
Allow from all
|
|
||||||
DirectoryIndex index.php
|
DirectoryIndex index.php
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user