From: Davide Franco <bacula-dev@dflc.ch>
Date: Tue, 22 Mar 2011 16:48:05 +0000 (+0100)
Subject: cula-web: Renamed configs folder to config
X-Git-Tag: Release-5.2.1~340
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a8d78397f3df30774be4e6a53bfe2ecffd3dbd73;p=bacula%2Fbacula

cula-web: Renamed configs folder to config

 - Changed path in config.inc.php
---

diff --git a/gui/bacula-web/config.inc.php b/gui/bacula-web/config.inc.php
index 409e24b8ea..3bf2354924 100644
--- a/gui/bacula-web/config.inc.php
+++ b/gui/bacula-web/config.inc.php
@@ -19,7 +19,7 @@
  require_once BW_OBJ . "bweb.inc.php";
  
  // Global constants
- define('CONFIG_DIR', BW_ROOT . "/configs/");
+ define('CONFIG_DIR', BW_ROOT . "/config/");
  define('CONFIG_FILE', CONFIG_DIR . "bacula.conf");
  
  // Time intervals in secondes
diff --git a/gui/bacula-web/config/.htaccess b/gui/bacula-web/config/.htaccess
new file mode 100644
index 0000000000..8d2f25636d
--- /dev/null
+++ b/gui/bacula-web/config/.htaccess
@@ -0,0 +1 @@
+deny from all
diff --git a/gui/bacula-web/config/bacula.conf b/gui/bacula-web/config/bacula.conf
new file mode 100644
index 0000000000..2111e25e64
--- /dev/null
+++ b/gui/bacula-web/config/bacula.conf
@@ -0,0 +1,28 @@
+; Language
+; en_EN -> English
+; es_ES -> Spanish, Mantained by Juan Luis Francés Jiménez.
+; it_IT -> Italian, Mantained by Gian Domenico Messina (gianni.messina AT c-ict.it).
+; fr_FR -> Frech, Mantained by Morgan LEFIEUX (comete AT daknet.org).
+; de_DE -> German, Mantained by Florian Heigl.
+lang = en_EN
+
+; Database connection configuration
+
+[.DATABASE]
+host = localhost					; Database host or IP
+login = root						; Database account name
+pass = p@ssw0rd						; Database account password
+db_name = bacula					; Database name
+db_type = mysql						; Database type
+;db_port = 3306						; Uncomment if not standard port
+
+; Multi-Catalog support
+; If you want to configure more than 1 Bacula catalog in Bacula-Web, simply copy the previous line (See example below)
+; Don't forget the change the name of the section (DATABASE2 in this case)
+
+;[.DATABASE2]
+;host = 192.168.2.55
+;login = bacula
+;pass =
+;db_name = bacula
+;db_type = mysql
diff --git a/gui/bacula-web/configs/.htaccess b/gui/bacula-web/configs/.htaccess
deleted file mode 100644
index 8d2f25636d..0000000000
--- a/gui/bacula-web/configs/.htaccess
+++ /dev/null
@@ -1 +0,0 @@
-deny from all
diff --git a/gui/bacula-web/configs/bacula.conf b/gui/bacula-web/configs/bacula.conf
deleted file mode 100644
index 2111e25e64..0000000000
--- a/gui/bacula-web/configs/bacula.conf
+++ /dev/null
@@ -1,28 +0,0 @@
-; Language
-; en_EN -> English
-; es_ES -> Spanish, Mantained by Juan Luis Francés Jiménez.
-; it_IT -> Italian, Mantained by Gian Domenico Messina (gianni.messina AT c-ict.it).
-; fr_FR -> Frech, Mantained by Morgan LEFIEUX (comete AT daknet.org).
-; de_DE -> German, Mantained by Florian Heigl.
-lang = en_EN
-
-; Database connection configuration
-
-[.DATABASE]
-host = localhost					; Database host or IP
-login = root						; Database account name
-pass = p@ssw0rd						; Database account password
-db_name = bacula					; Database name
-db_type = mysql						; Database type
-;db_port = 3306						; Uncomment if not standard port
-
-; Multi-Catalog support
-; If you want to configure more than 1 Bacula catalog in Bacula-Web, simply copy the previous line (See example below)
-; Don't forget the change the name of the section (DATABASE2 in this case)
-
-;[.DATABASE2]
-;host = 192.168.2.55
-;login = bacula
-;pass =
-;db_name = bacula
-;db_type = mysql