commit

ressources/glpi/debmaker

@@ -27,6 +27,10 @@ makedeb(){
 	PATH_DEB=/tmp/src/rootfs
 	PATH_DEB_INSTALL=/tmp/src/rootfs-install
 
+	mkdir -p ${PATH_DEB}/usr/share/doc/glpi/
+	mkdir -p ${PATH_DEB}/var/lib/glpi/
+	mkdir -p ${PATH_DEB}/etc/
+
 	tar -zxvf /tmp/${APP}-${VERSION}.tgz -C ${PATH_DEB}/usr/share/
 
 	mv ${PATH_DEB}/usr/share/glpi/install ${PATH_DEB_INSTALL}/usr/share/glpi/
@@ -35,14 +39,14 @@ makedeb(){
 	gzip ${PATH_DEB}/usr/share/doc/glpi/*
 
 	mv ${PATH_DEB}/usr/share/glpi/files ${PATH_DEB}/var/lib/glpi/
-	ln -s /var/lib/glpi/files ${PATH_DEB}/usr/share/glpi/files
+	mv ${PATH_DEB}/usr/share/glpi/config ${PATH_DEB}/etc/glpi
 
 	mv ${PATH_DEB}/usr/share/glpi/marketplace ${PATH_DEB}/var/lib/glpi/
 	ln -s /var/lib/glpi/marketplace ${PATH_DEB}/usr/share/glpi/marketplace
 
-	cp -r ${PATH_DEB}/usr/share/glpi/config/. ${PATH_DEB}/etc/glpi/
-	rm -fr ${PATH_DEB}/usr/share/glpi/config/
-	ln -s /etc/glpi/ ${PATH_DEB}/usr/share/glpi/config
+	mv ${PATH_DEB}/downstream.php ${PATH_DEB}/usr/share/glpi/inc/
+	mv ${PATH_DEB}/local_define.php ${PATH_DEB}/etc/glpi
+	mv ${PATH_DEB}/apache2-glpi.conf ${PATH_DEB}/usr/share/doc/glpi/
 
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist

ressources/glpi/rootfs/apache2-glpi.conf

@@ -0,0 +1,15 @@
+<VirtualHost *:80>
+	ServerName glpi.domaine.com
+	DocumentRoot /usr/share/glpi/public
+
+	<directory /usr/share/glpi/public>
+		Options FollowSymLinks
+		AllowOverride all
+		Require all granted
+		RewriteEngine On
+
+	        # Redirect all requests to GLPI router, unless file exists.
+		RewriteCond %{REQUEST_FILENAME} !-f
+	        RewriteRule ^(.*)$ index.php [QSA,L]
+	</directory>
+</VirtualHost>

ressources/glpi/rootfs/downstream.php

@@ -0,0 +1,6 @@
+<?php
+define('GLPI_CONFIG_DIR', '/etc/glpi/');
+
+if (file_exists(GLPI_CONFIG_DIR . '/local_define.php')) {
+   require_once GLPI_CONFIG_DIR . '/local_define.php';
+}

ressources/glpi/rootfs/etc/glpi/.gitkeep

@@ -1 +0,0 @@
-

ressources/glpi/rootfs/local_define.php

@@ -0,0 +1,3 @@
+<?php
+define('GLPI_VAR_DIR', '/var/lib/glpi/files/');
+define('GLPI_LOG_DIR', '/var/log/glpi');

ressources/glpi/rootfs/usr/share/doc/glpi/apache2-glpi.conf

@@ -1,10 +0,0 @@
-<VirtualHost *:80>
-	ServerName glpi.domaine.com
-	DocumentRoot /usr/share/glpi
-
-	<directory /usr/share/glpi>
-		Options FollowSymLinks
-		AllowOverride all
-		Require all granted
-	</directory>
-</VirtualHost>

ressources/glpi/rootfs/var/lib/glpi/.gitkeep

@@ -1 +0,0 @@
-