From 936cd6c1b3997b0e1fa87d07d9c8d4f7a436cc0d Mon Sep 17 00:00:00 2001
From: kemboi22 <kemboielvis22@gmail.com>
Date: Sat, 9 Mar 2024 00:49:34 +0300
Subject: [PATCH] Added SQL Connection in glpi-start.sh

---
 .idea/.gitignore      |  8 ++++++++
 .idea/docker-glpi.iml |  9 +++++++++
 .idea/misc.xml        |  6 ++++++
 .idea/modules.xml     |  8 ++++++++
 .idea/vcs.xml         |  6 ++++++
 glpi-start.sh         | 14 +++++++++++++-
 6 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/docker-glpi.iml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/docker-glpi.iml b/.idea/docker-glpi.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/docker-glpi.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..6f29fee
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..a043441
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/docker-glpi.iml" filepath="$PROJECT_DIR$/.idea/docker-glpi.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/glpi-start.sh b/glpi-start.sh
index f2d689e..1e5ee3f 100644
--- a/glpi-start.sh
+++ b/glpi-start.sh
@@ -46,7 +46,7 @@ LOCAL_GLPI_MAJOR_VERSION=$(echo $LOCAL_GLPI_VERSION | cut -d. -f1)
 LOCAL_GLPI_VERSION_NUM=${LOCAL_GLPI_VERSION//./}
 
 ## Target value is GLPI 1.0.7
-TARGET_GLPI_VERSION="10.0.7"
+TARGET_GLPI_VERSION="10.0.12"
 TARGET_GLPI_VERSION_NUM=${TARGET_GLPI_VERSION//./}
 TARGET_GLPI_MAJOR_VERSION=$(echo $TARGET_GLPI_VERSION | cut -d. -f1)
 
@@ -58,6 +58,18 @@ else
   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
 fi
 
+ {
+        echo "<?php"; \
+        echo "class DB extends DBmysql {"; \
+        echo "   public \$dbhost     = \"${MARIADB_HOST}\";"; \
+        echo "   public \$dbport     = \"${MARIADB_PORT}\";"; \
+        echo "   public \$dbuser     = \"${MARIADB_USER}\";"; \
+        echo "   public \$dbpassword = \"${MARIADB_PASSWORD}\";"; \
+        echo "   public \$dbdefault  = \"${MARIADB_DATABASE}\";"; \
+        echo "}"; \
+        echo ;
+} > /var/www/html/glpi/config/config_db.php
+
 #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
 #Start cron service