Merge pull request #1860 from josh4trunks/josh4trunks-patch-1

Update documentation

docs/installationguide/multiserver.rst

@@ -42,8 +42,6 @@ Note that these commands are just an example and might not be secure enough for
 
 7. If you have chosen to change the ZoneMinder database account credentials to something other than zmuser/zmpass, you must now update zm.conf on each ZoneMinder Server. Change ZM_DB_USER and ZM_DB_PASS to the values you created in the previous step.
 
-Additionally, you must also edit /usr/share/zoneminder/www/api/app/Config/database.php in a similar manner on each ZoneMinder Server. Scroll down and change login and password to the values you created in the previous step.
-
 8. All ZoneMinders Servers must share a common events folder. This can be done in any manner supported by the underlying operating system. From the Storage Server, share/export a folder to be used for ZoneMinder events.
 
 9. From each ZoneMinder Server, mount the shared events folder on the Storage Server to the events folder on the local ZoneMinder Server.

docs/installationguide/ubuntu.rst

@@ -358,24 +358,6 @@ Changed Default DB User
 ^^^^^^^^^^^^^^^^^^^^^^^
 
 If you have changed your DB login/password from zmuser/zmpass, you need to
-update these values in zm.conf and the API's database.php file.
+update these values in zm.conf.
 
 1. Edit zm.conf to change ZM_DB_USER and ZM_DB_PASS to the values you used.
-
-2. Edit databse.php which can be found in the web server folder zoneminder/www/api/app/Config
-
-There is a class there called DATABASE_CONFIG -
-change the $default array to reflect your new details. Example:
-
-::
-
-        public $default = array(
-                        'datasource' => 'Database/Mysql',
-                        'persistent' => false,
-                        'host' => 'localhost',
-                        'login' => 'mynewDBusername',
-                        'password' => 'mynewDBpassword'
-                        'database' => 'zm',
-                        'prefix' => '',
-                        //'encoding' => 'utf8',
-                );

zm.conf.in

@@ -34,7 +34,8 @@ ZM_WEB_GROUP=@WEB_GROUP@
 # ZoneMinder database type: so far only mysql is supported
 ZM_DB_TYPE=@ZM_DB_TYPE@
 
-# ZoneMinder database hostname or ip address
+# ZoneMinder database hostname or ip address and optionally port or unix socket
+# Acceptable formats include hostname[:port], ip_address[:port], or localhost:unix_socket
 ZM_DB_HOST=@ZM_DB_HOST@
 
 # ZoneMinder database name