Author: Lars Michelsen <[email protected]>
Date: Tue Apr 26 20:52:28 2011 +0200
Committer: Lars Michelsen <[email protected]>
Commit-Date: Tue Apr 26 20:52:28 2011 +0200
Changed default admin credentials to "admin/admin"
---
ChangeLog | 27 ++++++++++++----------
docs/de_DE/after_installation.html | 2 +-
docs/en_US/after_installation.html | 2 +-
install.sh | 4 +-
share/server/core/classes/CoreMySQLHandler.php | 4 +-
share/server/core/classes/CoreSQLiteHandler.php | 4 +-
6 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3fa80b3..915e4a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,17 +1,19 @@
1.6a1
Core
- * Added user/role profile config files located in
nagvis/etc/profiles/(user|role).profile
- The profile files can contain user/role specific options like languages
and so on
- * The language of a user is stored in the profile file now
- * The eventlog hide state is stored in the profile file now and used when
the eventlog is enabled for a map
- * Added new options {file_group} and {file_mode} to global section of
nagvis.ini.php.
- These options are used whenever a file is written by NagVis
- * Livestatus backend: Better error handling when writing to livestatus
socket
- * Lines can have three coords now to reposition the middle of lines having
- two arrows
- * Better handling for map config errors on overview page and map links -
- no whole screen errors anymore
+ * Default admin credentials for inital auth databases are now: User: admin
Password: admin
+ Admin credentials in existing auth databases are not changed.
+ * Added user/role profile config files located in
nagvis/etc/profiles/(user|role).profile
+ The profile files can contain user/role specific options like languages
and so on
+ * The language of a user is stored in the profile file now
+ * The eventlog hide state is stored in the profile file now and used when
the eventlog is enabled for a map
+ * Added new options {file_group} and {file_mode} to global section of
nagvis.ini.php.
+ These options are used whenever a file is written by NagVis
+ * Livestatus backend: Better error handling when writing to livestatus socket
+ * Lines can have three coords now to reposition the middle of lines having
+ two arrows
+ * Better handling for map config errors on overview page and map links -
+ no whole screen errors anymore
* The check_command parameter is available in NagVis now. NDO and
MKLivestatus backends fetch this info from the datasources now
* Hostgroup and Servicegroup aliases work again now. It might be neccessary
@@ -26,7 +28,7 @@ Core
* Cleaned up session auth code (Moved session module code to auth handler)
* Bugfix: The installer overwrites the default iconset files on upgrade as
expected
* Added mechanism to search userfiles in independent structures. This allows
- usage of the local/ structure in OMD
+ usage of the local/ structure in OMD
* Bugfix: Fixed section merging in main config when using more than one
config file
* Using configured permissions on uploaded files (backgrounds, shapes, maps)
now
* Gadgets: Added gadget_type option which can now be img/html. The value
@@ -67,6 +69,7 @@ Frontend
* Made background color in frontend configurable now
* The header menu has a minimal width now to prevent broken header menu on
small screens
* The header menu is now positioned to be shown on the screen all the time
+ * Recoded the header menu submenu code (simplified the HTML and JS code)
* Added buttons to show/hide the header menu (state saved per user)
* Added new option: event_log_events to define the number of events in the
eventlog scrollback
* Bugfix: Fixed php error when using custom css files in maps
diff --git a/docs/de_DE/after_installation.html
b/docs/de_DE/after_installation.html
index 7a33831..9515c31 100644
--- a/docs/de_DE/after_installation.html
+++ b/docs/de_DE/after_installation.html
@@ -23,7 +23,7 @@
<p>Als Standard benutzt NagVis eine interne Benutzer- und
Berechtigungsdatenbank (SQLite) für Authentifizierung und Autorisierung.
NagVis besitzt ein rollenbasiertes Berechtigungssystem. Nach der
Installation sind zwei Default-Benutzer definiert:</p>
<ul>
- <li>Username: nagiosadmin, Password: nagiosadmin</li>
+ <li>Username: admin, Password: admin</li>
<li>Username: guest, Password: guest</li>
</ul>
<p>Die folgenden Rollen mit diesen Berechtigungen sind
verfügbar:</p>
diff --git a/docs/en_US/after_installation.html
b/docs/en_US/after_installation.html
index 0eb335e..1fcd856 100644
--- a/docs/en_US/after_installation.html
+++ b/docs/en_US/after_installation.html
@@ -15,7 +15,7 @@
<h2>Authentication/Authorisation</h2>
<p>By default NagVis uses an internal user and permission database
(SQLite) for handling authentication and authorisation. Nagvis uses a role
based permission system. After installation there are two default users
defined:</p>
<ul>
- <li>Username: nagiosadmin, Password: nagiosadmin</li>
+ <li>Username: admin, Password: admin</li>
<li>Username: guest, Password: guest</li>
</ul>
<p>The following roles with these permissions are available:</p>
diff --git a/install.sh b/install.sh
index 3e2215e..813c9d8 100755
--- a/install.sh
+++ b/install.sh
@@ -1713,8 +1713,8 @@ text "| Its location is: $NAGVIS_PATH/$NAGVIS_CONF" "|"
text "| - Configure NagVis via browser" "|"
text "| <http://localhost${HTML_PATH}/config.php>" "|"
text "| - Initial admin credentials:" "|"
-text "| Username: nagiosadmin" "|"
-text "| Password: nagiosadmin" "|"
+text "| Username: admin" "|"
+text "| Password: admin" "|"
line
} 2>&1 | tee $LOG
diff --git a/share/server/core/classes/CoreMySQLHandler.php
b/share/server/core/classes/CoreMySQLHandler.php
index c71ef25..7bab30d 100644
--- a/share/server/core/classes/CoreMySQLHandler.php
+++ b/share/server/core/classes/CoreMySQLHandler.php
@@ -232,7 +232,7 @@ class CoreMySQLHandler {
$this->query('CREATE TABLE version (version VARCHAR(100),
PRIMARY KEY(version))');
$this->query('INSERT INTO version (version) VALUES
(\''.CONST_VERSION.'\')');
- $this->query('INSERT INTO users (userId, name, password) VALUES
(1, \'nagiosadmin\', \'7f09c620da83db16ef9b69abfb8edd6b849d2d2b\')');
+ $this->query('INSERT INTO users (userId, name, password) VALUES
(1, \'admin\', \'868103841a2244768b2dbead5dbea2b533940e20\')');
$this->query('INSERT INTO users (userId, name, password) VALUES
(2, \'guest\', \'7f09c620da83db16ef9b69abfb8edd6b849d2d2b\')');
$this->query('INSERT INTO roles (roleId, name) VALUES (1,
\'Administrators\')');
$this->query('INSERT INTO roles (roleId, name) VALUES (2,
\'Users (read-only)\')');
@@ -310,7 +310,7 @@ class CoreMySQLHandler {
$data = $this->fetchAssoc($this->query('SELECT roleId FROM
roles WHERE name=\'Administrators\''));
- // Role assignment: nagiosadmin => Administrators
+ // Role assignment: admin => Administrators
$this->query('INSERT INTO users2roles (userId, roleId) VALUES
(1, '.$data['roleId'].')');
// Access assignment: Administrators => * * *
diff --git a/share/server/core/classes/CoreSQLiteHandler.php
b/share/server/core/classes/CoreSQLiteHandler.php
index c5d3b9c..4a281c1 100644
--- a/share/server/core/classes/CoreSQLiteHandler.php
+++ b/share/server/core/classes/CoreSQLiteHandler.php
@@ -254,7 +254,7 @@ class CoreSQLiteHandler {
$this->createVersionTable();
- $this->DB->query('INSERT INTO users (userId, name, password)
VALUES (1, \'nagiosadmin\', \'7f09c620da83db16ef9b69abfb8edd6b849d2d2b\')');
+ $this->DB->query('INSERT INTO users (userId, name, password)
VALUES (1, \'admin\', \'868103841a2244768b2dbead5dbea2b533940e20\')');
$this->DB->query('INSERT INTO users (userId, name, password)
VALUES (2, \'guest\', \'7f09c620da83db16ef9b69abfb8edd6b849d2d2b\')');
$this->DB->query('INSERT INTO roles (roleId, name) VALUES (1,
\'Administrators\')');
$this->DB->query('INSERT INTO roles (roleId, name) VALUES (2,
\'Users (read-only)\')');
@@ -332,7 +332,7 @@ class CoreSQLiteHandler {
$data = $this->fetchAssoc($this->DB->query('SELECT roleId FROM
roles WHERE name=\'Administrators\''));
- // Role assignment: nagiosadmin => Administrators
+ // Role assignment: admin => Administrators
$this->DB->query('INSERT INTO users2roles (userId, roleId)
VALUES (1, '.$data['roleId'].')');
// Access assignment: Administrators => * * *
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
