From 5e45330a4495172cd509155c57194d9d1ffa6b3d Mon Sep 17 00:00:00 2001
From: p1ne <8995611+p1ne@users.noreply.github.com>
Date: Tue, 25 Apr 2023 17:12:02 +0300
Subject: [PATCH] Make apache config compatible with 10.0.7

See https://glpi-install.readthedocs.io/en/develop/prerequisites.html#apache-configuration for updated apache format
---
 glpi-start.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/glpi-start.sh b/glpi-start.sh
index 92063aa..2f29845 100644
--- a/glpi-start.sh
+++ b/glpi-start.sh
@@ -34,7 +34,8 @@ else
 fi
 
 #Modification du vhost par défaut
-echo -e "<VirtualHost *:80>\n\tDocumentRoot /var/www/html/glpi\n\n\t<Directory /var/www/html/glpi>\n\t\tAllowOverride All\n\t\tOrder Allow,Deny\n\t\tAllow from all\n\t</Directory>\n\n\tErrorLog /var/log/apache2/error-glpi.log\n\tLogLevel warn\n\tCustomLog /var/log/apache2/access-glpi.log combined\n</VirtualHost>" > /etc/apache2/sites-available/000-default.conf
+set +H
+echo -e "<VirtualHost *:80>\n\tDocumentRoot /var/www/html/glpi/public\n\n\t<Directory /var/www/html/glpi/public>\n\t\tRequire all granted\n\t\tRewriteEngine On\n\t\tRewriteCond %{REQUEST_FILENAME} !-f\n\t\n\t\tRewriteRule ^(.*)$ index.php [QSA,L]\n\t</Directory>\n\n\tErrorLog /var/log/apache2/error-glpi.log\n\tLogLevel warn\n\tCustomLog /var/log/apache2/access-glpi.log combined\n</VirtualHost>" > /etc/apache2/sites-available/000-default.conf
 
 #Add scheduled task by cron and enable
 echo "*/2 * * * * www-data /usr/bin/php /var/www/html/glpi/front/cron.php &>/dev/null" >> /etc/cron.d/glpi