summaryrefslogtreecommitdiffstats
path: root/application/configs
diff options
context:
space:
mode:
authorSimon2011-03-06 13:04:04 +0100
committerSimon2011-03-06 13:04:04 +0100
commit72ab13da979af7ccfc5ecbf48ffc304189edf508 (patch)
tree120ff3c43795767983042b05223d2df9e9ca6273 /application/configs
parentMerge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2 (diff)
downloadpbs2-72ab13da979af7ccfc5ecbf48ffc304189edf508.tar.gz
pbs2-72ab13da979af7ccfc5ecbf48ffc304189edf508.tar.xz
pbs2-72ab13da979af7ccfc5ecbf48ffc304189edf508.zip
update
Diffstat (limited to 'application/configs')
-rw-r--r--application/configs/application.ini2
-rw-r--r--application/configs/application.ini 26
2 files changed, 27 insertions, 1 deletions
diff --git a/application/configs/application.ini b/application/configs/application.ini
index 6970da3..9bfaec2 100644
--- a/application/configs/application.ini
+++ b/application/configs/application.ini
@@ -10,7 +10,7 @@ resources.frontController.params.displayExceptions = 0
resources.db.adapter = PDO_MYSQL
resources.db.params.host = localhost
resources.db.params.username = root
-resources.db.params.password = lsfks
+resources.db.params.password = 123456
resources.db.params.dbname = pbs
resources.db.isDefaultTableAdapter = true
diff --git a/application/configs/application.ini b/application/configs/application.ini
new file mode 100644
index 0000000..6970da3
--- /dev/null
+++ b/application/configs/application.ini
@@ -0,0 +1,26 @@
+[production]
+phpSettings.display_startup_errors = 0
+phpSettings.display_errors = 0
+includePaths.library = APPLICATION_PATH "/../library"
+bootstrap.path = APPLICATION_PATH "/Bootstrap.php"
+bootstrap.class = "Bootstrap"
+appnamespace = "Application"
+resources.frontController.controllerDirectory = APPLICATION_PATH "/controllers"
+resources.frontController.params.displayExceptions = 0
+resources.db.adapter = PDO_MYSQL
+resources.db.params.host = localhost
+resources.db.params.username = root
+resources.db.params.password = lsfks
+resources.db.params.dbname = pbs
+resources.db.isDefaultTableAdapter = true
+
+[staging : production]
+
+[testing : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+
+[development : production]
+phpSettings.display_startup_errors = 1
+phpSettings.display_errors = 1
+resources.frontController.params.displayExceptions = 1