From 841317e0f4bc1f429055b320c0008097d5e82842 Mon Sep 17 00:00:00 2001
From: Georg Pfuetzenreuter
Date: Mon, 1 May 2023 00:00:31 +0200
Subject: Repair BookStack httpd configuration
- Replace wrong instances of RewriteCond with RewriteRule
- Remove wrong quotes around rewrite conditions
- Set correct options (seemingly our version of httpd does not set
FollowSymLinks by default?)
Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>
---
pillar/id/themis_lysergic_dev.sls | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
(limited to 'pillar/id')
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') }}
--
cgit v1.2.3