aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiam McLoughlin <hexxeh@hexxeh.net>2011-08-10 18:39:11 +0100
committerLiam McLoughlin <hexxeh@hexxeh.net>2011-08-10 18:39:11 +0100
commit7f2c98b0d095c5c173fed07a0f8f32d51798d97e (patch)
treefe1d3817c8a221c72c70a0205f8e776e08554ec7 /web/config.php
parentAdding GNOME config (diff)
downloadgentoaster-7f2c98b0d095c5c173fed07a0f8f32d51798d97e.tar.gz
gentoaster-7f2c98b0d095c5c173fed07a0f8f32d51798d97e.tar.bz2
gentoaster-7f2c98b0d095c5c173fed07a0f8f32d51798d97e.zip
Combine configs, fix image download path via a new config option, add initscript
Diffstat (limited to 'web/config.php')
-rw-r--r--web/config.php11
1 files changed, 4 insertions, 7 deletions
diff --git a/web/config.php b/web/config.php
index 38076e8..9c5ef50 100644
--- a/web/config.php
+++ b/web/config.php
@@ -36,13 +36,10 @@
// What should we limit the virtual machine disk size to?
define("MAX_DISK_SIZE", 16384);
- // Set the MySQL access details that should be used
- define("MYSQL_HOSTNAME", "localhost");
- define("MYSQL_USERNAME", "gentoaster");
- define("MYSQL_PASSWORD", "");
- define("MYSQL_DATABASE", "gentoaster");
-
// Set the RECAPTCHA keys that should be used, if enabled
define("RECAPTCHA_ENABLED", false);
define("RECAPTCHA_PUBLIC_KEY", "REPLACE_ME");
- define("RECAPTCHA_PRIVATE_KEY", "REPLACE_ME"); \ No newline at end of file
+ define("RECAPTCHA_PRIVATE_KEY", "REPLACE_ME");
+
+ // Load all the configuration for the daemon, too
+ require_once GENTOASTER_PATH."/config.php"; \ No newline at end of file