diff options
| author | Georg Pfuetzenreuter | 2023-05-01 00:08:00 +0200 |
|---|---|---|
| committer | Georg Pfuetzenreuter | 2023-05-01 00:08:00 +0200 |
| commit | 27d178d852c9e07ed58751a38bc42b1153821bfd (patch) | |
| tree | 1dd4f7a9c3d5ed36322408f9c0430917070b0ba7 /pillar | |
| parent | 5f1793547b91fc0cc93b82feec512b953a6d7f45 (diff) | |
| parent | 841317e0f4bc1f429055b320c0008097d5e82842 (diff) | |
| download | salt-27d178d852c9e07ed58751a38bc42b1153821bfd.tar.gz salt-27d178d852c9e07ed58751a38bc42b1153821bfd.tar.bz2 salt-27d178d852c9e07ed58751a38bc42b1153821bfd.zip | |
Merge pull request 'Repair BookStack httpd configuration' (#57) from themis-httpd-fixup into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/57
Diffstat (limited to 'pillar')
| -rw-r--r-- | pillar/id/themis_lysergic_dev.sls | 18 |
1 files changed, 9 insertions, 9 deletions
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') }} |