summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/configs/application.ini.dist1
-rwxr-xr-xinstall.sh6
-rw-r--r--setup/poolctrl.sql4
-rw-r--r--setup/poolctrl_data.sql2
4 files changed, 7 insertions, 6 deletions
diff --git a/application/configs/application.ini.dist b/application/configs/application.ini.dist
index d9ca700..063674c 100644
--- a/application/configs/application.ini.dist
+++ b/application/configs/application.ini.dist
@@ -6,6 +6,7 @@ bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
bootstrap.class = "Bootstrap"
appnamespace = "Application"
resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.moduleDirectory = APPLICATION_PATH "/modules"
resources.frontController.params.displayExceptions = 0
resources.db.adapter = PDO_MYSQL
resources.db.params.host = localhost
diff --git a/install.sh b/install.sh
index 07ad438..73d1cca 100755
--- a/install.sh
+++ b/install.sh
@@ -53,16 +53,16 @@ stty echo
echo -n "Please enter username for poolctrl db: "
read db_user
-sed -e "13s/\$/$db_user/" -i $targetDir/application/configs/application.ini
+sed -e "12s/\$/$db_user/" -i $targetDir/application/configs/application.ini
#echo -n "Please enter password for poolctrl db user $databaseuser: "
#read databasepassword
db_pass=$(md5sum /var/log/syslog| awk '{print $1}')
-sed -e "14s/\$/$db_pass/" -i $targetDir/application/configs/application.ini
+sed -e "13s/\$/$db_pass/" -i $targetDir/application/configs/application.ini
echo -n "Enter database name: "
read db_name
-sed -e "15s/\$/$db_name/" -i $targetDir/application/configs/application.ini
+sed -e "14s/\$/$db_name/" -i $targetDir/application/configs/application.ini
echo "Create database and tables"
cat $targetDir/setup/poolctrl.sql | sed -e "s,##poolctrl##,$db_name," > /tmp/poolctrl.sql
diff --git a/setup/poolctrl.sql b/setup/poolctrl.sql
index ba93efe..f565baf 100644
--- a/setup/poolctrl.sql
+++ b/setup/poolctrl.sql
@@ -1,5 +1,5 @@
-CREATE DATABASE `poolctrl` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-USE poolctrl;
+CREATE DATABASE `##poolctrl##` DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci;
+USE ##poolctrl##;
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-- PoolCtrl Tabellen
diff --git a/setup/poolctrl_data.sql b/setup/poolctrl_data.sql
index acef3a0..e0c84d5 100644
--- a/setup/poolctrl_data.sql
+++ b/setup/poolctrl_data.sql
@@ -1,4 +1,4 @@
-USE poolctrl;
+USE ##poolctrl##;
SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
-- Adding person test2