From: Davide Franco <bacula-dev@dflc.ch>
Date: Thu, 2 Jun 2011 11:38:13 +0000 (+0200)
Subject: bacula-web: Renammed config filename and updated gitignore file
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=55a788a91f2c24f2c432aeb5a7dbc57cef25c754;p=bacula%2Fbacula

bacula-web: Renammed config filename and updated gitignore file

 - updated content of config.php.sample
 - updated content of gitignore which exclude now config/config.php also
---

diff --git a/gui/bacula-web/.gitignore b/gui/bacula-web/.gitignore
index a27989e2c1..df1c19b7c4 100644
--- a/gui/bacula-web/.gitignore
+++ b/gui/bacula-web/.gitignore
@@ -1,2 +1,3 @@
-*.php
-*.png
+/templates_c/*.php
+/templates_c/*.png
+/config/config.php
diff --git a/gui/bacula-web/config/config.php b/gui/bacula-web/config/config.php
deleted file mode 100644
index d27214a4ab..0000000000
--- a/gui/bacula-web/config/config.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
- /* 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.
- */
- 
- $config['language'] = 'en_EN';
-
- //MySQL bacula catalog
- $config[0]['label'] = 'Backup/mysql';
- $config[0]['host'] = 'localhost';
- $config[0]['login'] = 'root';
- $config[0]['password'] = 'p@ssw0rd';
- $config[0]['db_name'] = 'bacula';
- $config[0]['db_type'] = 'mysql';
- $config[0]['db_port'] = '3306';
- 
-  //MySQL bacula catalog
- $config[1]['label'] = 'Backup/pgsql';
- $config[1]['host'] = 'localhost';
- $config[1]['login'] = 'bacula';
- $config[1]['password'] = 'bacula';
- $config[1]['db_name'] = 'bacula';
- $config[1]['db_type'] = 'pgsql';
- $config[1]['db_port'] = '5432';
- 
- /* Catalog(s) connection parameters
- Just copy/paste and modify regarding your configuration
-
- Example: 
- 
- //MySQL bacula catalog
- $config[0]['label'] = 'Backup Server';
- $config[0]['host'] = 'localhost';
- $config[0]['login'] = 'bacula';
- $config[0]['password'] = 'verystrongpassword';
- $config[0]['db_name'] = 'bacula';
- $config[0]['db_type'] = 'mysql';
- $config[0]['db_port'] = '3306';
-
- // PostgreSQL bacula catalog
- $config[0]['label'] = 'Prod Server';
- $config[0]['host'] = 'db-server.domain.com';
- $config[0]['login'] = 'bacula';
- $config[0]['password'] = 'otherstrongpassword';
- $config[0]['db_name'] = 'bacula';
- $config[0]['db_type'] = 'pgsql';
- $config[0]['db_port'] = '5432'; 
- 
- // SQLite bacula catalog
- $config[0]['label'] = 'Dev backup server';
- $config[0]['db_path'] = '/path/to/database/db.sdb';
-
- If you want to configure more than one catalog in Bacula-Web, just copy the first parameters and increment by one the index
-
-  //MySQL bacula catalog
- $config[1]['label'] = 'Dev backup server';
- $config[1]['host'] = 'mysql-server.domain.net';
- $config[1]['login'] = 'bacula';
- $config[1]['password'] = 'verystrongpassword';
- $config[1]['db_name'] = 'bacula';
- $config[1]['db_type'] = 'mysql';
- $config[1]['db_port'] = '3306';
- */
-?>
diff --git a/gui/bacula-web/config/config.php.sample b/gui/bacula-web/config/config.php.sample
new file mode 100644
index 0000000000..ddddd521b3
--- /dev/null
+++ b/gui/bacula-web/config/config.php.sample
@@ -0,0 +1,51 @@
+<?php
+
+ /* 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.
+ */
+ 
+ $config['language'] = 'en_EN';
+
+ /* Catalog(s) connection parameters
+ Just copy/paste and modify regarding your configuration
+
+ Example: 
+ 
+ //MySQL bacula catalog
+ $config[0]['label'] = 'Backup Server';
+ $config[0]['host'] = 'localhost';
+ $config[0]['login'] = 'bacula';
+ $config[0]['password'] = 'verystrongpassword';
+ $config[0]['db_name'] = 'bacula';
+ $config[0]['db_type'] = 'mysql';
+ $config[0]['db_port'] = '3306';
+
+ // PostgreSQL bacula catalog
+ $config[0]['label'] = 'Prod Server';
+ $config[0]['host'] = 'db-server.domain.com';
+ $config[0]['login'] = 'bacula';
+ $config[0]['password'] = 'otherstrongpassword';
+ $config[0]['db_name'] = 'bacula';
+ $config[0]['db_type'] = 'pgsql';
+ $config[0]['db_port'] = '5432'; 
+ 
+ // SQLite bacula catalog
+ $config[0]['label'] = 'Dev backup server';
+ $config[0]['db_path'] = '/path/to/database/db.sdb';
+
+ If you want to configure more than one catalog in Bacula-Web, just copy the first parameters and increment by one the index
+
+  //MySQL bacula catalog
+ $config[1]['label'] = 'Dev backup server';
+ $config[1]['host'] = 'mysql-server.domain.net';
+ $config[1]['login'] = 'bacula';
+ $config[1]['password'] = 'verystrongpassword';
+ $config[1]['db_name'] = 'bacula';
+ $config[1]['db_type'] = 'mysql';
+ $config[1]['db_port'] = '3306';
+ */
+?>