Merge pull request 'Repair BookStack httpd configuration' (#57 ) from themis-httpd-fixup into production

Reviewed-on: #57
Repair BookStack httpd configuration
2023-05-01 00:08:00 +02:00 · 2023-05-01 00:00:31 +02:00
1 changed files with 9 additions and 9 deletions
--- 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 %{HTTP:Authorization} .
-            RewriteCond '.* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]'
+            RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
-            RewriteCond '%{REQUEST_FILENAME} !-d'
+            RewriteCond %{REQUEST_FILENAME} !-d
-            RewriteCond '%{REQUEST_URI} (.+)/$'
+            RewriteCond %{REQUEST_URI} (.+)/$
-            RewriteCond '^ %1 [L,R=301]'
+            RewriteRule ^ %1 [L,R=301]
-            RewriteCond '%{REQUEST_FILENAME} !-d'
+            RewriteCond %{REQUEST_FILENAME} !-d
-            RewriteCond '%{REQUEST_FILENAME} !-f'
+            RewriteCond %{REQUEST_FILENAME} !-f
-            RewriteCond '^ index.php [L]'
+            RewriteRule ^ index.php [L]
      {{ httpdformulaexcess() }}
      Formula_Append: |
        {{ httpdcommon('BookStack') }}
Author	SHA1	Message	Date
Georg Pfuetzenreuter	27d178d852	Merge pull request 'Repair BookStack httpd configuration' (#57 ) from themis-httpd-fixup into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #57	2023-05-01 00:08:00 +02:00
Georg Pfuetzenreuter	841317e0f4	Repair BookStack httpd configuration All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details - 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>	2023-05-01 00:00:31 +02:00