summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rw-r--r--config.php15
2 files changed, 7 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore
index 4671496..40525d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
+/db-config.php
/InfoRouter.plain
/topology.dot.plain
-
diff --git a/config.php b/config.php
index d806fbb..b989381 100644
--- a/config.php
+++ b/config.php
@@ -1,20 +1,17 @@
<?php
-$conf['db']['user'] = 'ffscript';
-$conf['db']['password'] = 'woasinid';
-$conf['db']['host'] = 'localhost';
-$conf['db']['database'] = 'mappe';
+require_once("db-config.php");
$conf['topo']['file'] = 'topology.dot.plain';
$conf['router']['file'] = 'InfoRouter.plain';
/* neue eintraege bitte kommentieren !!!! */
$conf['acl']['range'] = array(
- "10.0.0.0/8", // Funkfeuer Graz et.al Private Adressen
- "193.33.150.0/23", // Funkfeuer Graz Public
- "217.29.149.64/28", // 0xFF Citycom IP Bereich
- "193.238.156.0/22", // Funkfeuer Wien
- "89.106.208.0/21" // mur.at
+ "10.0.0.0/8", // Funkfeuer Graz et.al Private Adressen
+ "193.33.150.0/23", // Funkfeuer Graz Public
+ "217.29.149.64/28", // 0xFF Citycom IP Bereich
+ "193.238.156.0/22", // Funkfeuer Wien
+ "89.106.208.0/21" // mur.at
);
?>