From 19d30190e20f1c0b2848ea4043aaf9c31e48e386 Mon Sep 17 00:00:00 2001
From: Guillaume Mazoyer <respawneral@gmail.com>
Date: Tue, 5 Aug 2014 16:34:22 +0200
Subject: Add config.defaults.php to set default configuration options.

The defaults can be overriden in the config.php file but some of
them are fine as defaults. This will help in having a config.php
file as short as we can.

Also move utils.php to the includes directory.
---
 routers/bird.php    | 2 +-
 routers/cisco.php   | 2 +-
 routers/juniper.php | 2 +-
 routers/quagga.php  | 2 +-
 routers/router.php  | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'routers')

diff --git a/routers/bird.php b/routers/bird.php
index 4abd788..420cd42 100644
--- a/routers/bird.php
+++ b/routers/bird.php
@@ -20,7 +20,7 @@
  */
 
 require_once 'router.php';
-require_once 'utils.php';
+require_once 'includes/utils.php';
 
 final class Bird extends Router {
   protected function build_commands($command, $parameters) {
diff --git a/routers/cisco.php b/routers/cisco.php
index fa010e1..593b293 100644
--- a/routers/cisco.php
+++ b/routers/cisco.php
@@ -20,7 +20,7 @@
  */
 
 require_once 'router.php';
-require_once 'utils.php';
+require_once 'includes/utils.php';
 
 final class Cisco extends Router {
   protected function build_commands($command, $parameters) {
diff --git a/routers/juniper.php b/routers/juniper.php
index 30d783b..99da240 100644
--- a/routers/juniper.php
+++ b/routers/juniper.php
@@ -20,7 +20,7 @@
  */
 
 require_once 'router.php';
-require_once 'utils.php';
+require_once 'includes/utils.php';
 
 final class Juniper extends Router {
   protected function build_commands($command, $parameters) {
diff --git a/routers/quagga.php b/routers/quagga.php
index c905a5e..9f6426d 100644
--- a/routers/quagga.php
+++ b/routers/quagga.php
@@ -20,7 +20,7 @@
  */
 
 require_once 'router.php';
-require_once 'utils.php';
+require_once 'includes/utils.php';
 
 final class Quagga extends Router {
   protected function build_commands($command, $parameters) {
diff --git a/routers/router.php b/routers/router.php
index f1d2427..03336ac 100644
--- a/routers/router.php
+++ b/routers/router.php
@@ -19,12 +19,13 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
+require_once 'includes/config.defaults.php';
 require_once 'config.php';
 require_once 'bird.php';
 require_once 'cisco.php';
 require_once 'juniper.php';
 require_once 'quagga.php';
-require_once 'utils.php';
+require_once 'includes/utils.php';
 require_once 'auth/authentication.php';
 
 abstract class Router {
-- 
cgit v1.2.3