diff --git a/pillar/id/themis_lysergic_dev.sls b/pillar/id/themis_lysergic_dev.sls index 5c3df5e..9078fe1 100644 --- a/pillar/id/themis_lysergic_dev.sls +++ b/pillar/id/themis_lysergic_dev.sls @@ -25,19 +25,19 @@ apache: DirectoryIndex: index.php Directory: /srv/www/BookStack/: - Options: false + Options: FollowSymLinks AllowOverride: None Require: all granted Formula_Append: | RewriteEngine On - RewriteCond '%{HTTP:Authorization} .' - RewriteCond '.* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]' - RewriteCond '%{REQUEST_FILENAME} !-d' - RewriteCond '%{REQUEST_URI} (.+)/$' - RewriteCond '^ %1 [L,R=301]' - RewriteCond '%{REQUEST_FILENAME} !-d' - RewriteCond '%{REQUEST_FILENAME} !-f' - RewriteCond '^ index.php [L]' + RewriteCond %{HTTP:Authorization} . + RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_URI} (.+)/$ + RewriteRule ^ %1 [L,R=301] + RewriteCond %{REQUEST_FILENAME} !-d + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ index.php [L] {{ httpdformulaexcess() }} Formula_Append: | {{ httpdcommon('BookStack') }}