From 83d34c787d5d6072fa10aff494edb06150896924 Mon Sep 17 00:00:00 2001
From: Michael Friedrich <michael.friedrich@gmail.com>
Date: Fri, 14 Nov 2014 00:30:39 +0100
Subject: [PATCH] RPMs: Update README.md

refs #6401
---
 packages/rpm/README.md | 47 +++++++++++++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 12 deletions(-)

diff --git a/packages/rpm/README.md b/packages/rpm/README.md
index 293682a76..6daf41a63 100644
--- a/packages/rpm/README.md
+++ b/packages/rpm/README.md
@@ -19,21 +19,32 @@ provided by Icinga (2) Core.
 
     setenforce 0
 
-## Webinterface Login
+## Webserver Configuration
+
+Can be generated using the following local icingacli command:
+
+    /usr/share/icingaweb2/bin/icingacli setup config webserver apache
+
+Pipe the output into `/etc/httpd/conf.d/icingaweb2.conf` or similar,
+if not already existing.
+
+## Setup Wizard
+
+Navigate to `/icingaweb/setup` and follow the on-screen instructions.
 
-The default credentials using the internal MySQL database are
-`icingaadmin:icinga`
 
 ## Support
 
 Please use one of the listed support channels at https://support.icinga.org
 
 
-## Internal DB Setup
+## Manual Setup
+
+### Internal DB Setup
 
 Decide whether to use MySQL or PostgreSQL.
 
-### MySQL
+#### MySQL
 
     mysql -u root -p
         CREATE USER `icingaweb`@`localhost` IDENTIFIED BY 'icingaweb';
@@ -42,9 +53,9 @@ Decide whether to use MySQL or PostgreSQL.
         FLUSH PRIVILEGES;
         quit
 
-    mysql -u root -p icingaweb < /usr/share/doc/icingaweb2*/schema/mysql.sql
+    mysql -u root -p icingaweb < /usr/share/doc/icingaweb2*/schema/mysql.schema..sql
 
-### PostgreSQL
+#### PostgreSQL
 
     sudo su postgres
     psql
@@ -61,16 +72,16 @@ in `/var/lib/pgsql/data/pg_hba.conf` and restart the PostgreSQL server.
 
 Now install the `icingaweb` schema
 
-    bash$  psql -U icingaweb -a -f /usr/share/doc/icingaweb2*/schema/pgsql.sql
+    bash$  psql -U icingaweb -a -f /usr/share/doc/icingaweb2*/schema/pgsql.schema.sql
 
 
-## Configuration
+### Configuration
 
-### Module Configuration
+#### Module Configuration
 
 The monitoring module is enabled by default.
 
-### Backend configuration
+#### Backend configuration
 
 `/etc/icingaweb2/resources.ini` contains the database backend information.
 By default the Icinga 2 DB IDO is used by the monitoring module in
@@ -80,8 +91,20 @@ The external command pipe is required for sending commands
 and configured for Icinga 2 in
 `/etc/icingaweb2/modules/monitoring/instances.ini`
 
-### Authentication configuration
+#### Authentication configuration
 
 The `/etc/icingaweb2/authentication.ini` file uses the internal database as
 default. This requires the database being installed properly before
 allowing users to login via web console.
+
+#### Default User
+
+When not using the default setup wizard, you can generate a secure password hash with openssl
+and insert that manually like so:
+
+    openssl passwd -1 "yoursecurepassword"
+
+    mysql -uicingaweb -p icingaweb
+
+    mysql> INSERT INTO icingaweb_user (name, active, password_hash) VALUES ('icingaadmin', 1, '$yoursecurepassword_hash');
+