Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update installation instructions for easier navigation on icinga.com #9230

Merged
merged 1 commit into from
Feb 21, 2022

Conversation

julianbrost
Copy link
Contributor

Slightly different procedure as usual because I missed that #9217 was based on support/2.13 instead of master during the internal review, so we're doing this now the other way around this time to get things into a consistent state again.

This PR is the result of git cherry-pick 659dfc0c528077eda2e0a9400c6f8a710a92c593 with manual conflict resolution in doc/02-installation.md (basically manually applying the changes that happened in that file in the meantime):

git diff v2.13.0..master doc/02-installation.md:

diff --git a/doc/02-installation.md b/doc/02-installation.md
index b6baea00e..4e0462277 100644
--- a/doc/02-installation.md
+++ b/doc/02-installation.md
@@ -151,7 +151,7 @@ CentOS 8 additionally needs the PowerTools repository for EPEL:
 
 ```bash
 dnf install 'dnf-command(config-manager)'
-dnf config-manager --set-enabled PowerTools
+dnf config-manager --set-enabled powertools
 
 dnf install epel-release
 ```
@@ -711,17 +711,20 @@ Set up a MySQL database for Icinga 2:
 # mysql -u root -p
 
 CREATE DATABASE icinga;
-GRANT SELECT, INSERT, UPDATE, DELETE, DROP, CREATE VIEW, INDEX, EXECUTE ON icinga.* TO 'icinga'@'localhost' IDENTIFIED BY 'icinga';
+GRANT ALTER, CREATE, SELECT, INSERT, UPDATE, DELETE, DROP, CREATE VIEW, INDEX, EXECUTE ON icinga.* TO 'icinga'@'localhost' IDENTIFIED BY 'icinga';
 quit
 ```
 
+Please note that the example above uses the very simple password 'icinga' (in `IDENTIFIED BY 'icinga'`). 
+Please choose a better password for your installation.
+
 ![setting up the database on CentOS 7](images/installation/mariadb-centos7.png "Setting up the database on CentOS 7")
 
 After creating the database you can import the Icinga 2 IDO schema using the
-following command. Enter the root password into the prompt when asked.
+following command. Enter the icinga password into the prompt when asked.
 
 ```bash
-mysql -u root -p icinga < /usr/share/icinga2-ido-mysql/schema/mysql.sql
+mysql -u icinga -p icinga < /usr/share/icinga2-ido-mysql/schema/mysql.sql
 ```
 
 #### Enabling the IDO MySQL module <a id="enabling-ido-mysql"></a>

git diff support/2.13..feature/installation-instructions doc/02-installation.md:

diff --git a/doc/02-installation.md b/doc/02-installation.md
index 7483da6c6..004eaf163 100644
--- a/doc/02-installation.md
+++ b/doc/02-installation.md
@@ -624,15 +624,18 @@ Set up a MySQL database for Icinga 2:
 # mysql -u root -p
 
 CREATE DATABASE icinga;
-GRANT SELECT, INSERT, UPDATE, DELETE, DROP, CREATE VIEW, INDEX, EXECUTE ON icinga.* TO 'icinga'@'localhost' IDENTIFIED BY 'icinga';
+GRANT ALTER, CREATE, SELECT, INSERT, UPDATE, DELETE, DROP, CREATE VIEW, INDEX, EXECUTE ON icinga.* TO 'icinga'@'localhost' IDENTIFIED BY 'icinga';
 quit
 ```
 
+Please note that the example above uses the very simple password 'icinga' (in `IDENTIFIED BY 'icinga'`).
+Please choose a better password for your installation.
+
 After creating the database you can import the Icinga 2 IDO schema using the
-following command. Enter the root password into the prompt when asked.
+following command. Enter the icinga password into the prompt when asked.
 
 ```bash
-mysql -u root -p icinga < /usr/share/icinga2-ido-mysql/schema/mysql.sql
+mysql -u icinga -p icinga < /usr/share/icinga2-ido-mysql/schema/mysql.sql
 ```
 
 #### Enable the IDO MySQL feature <a id="enable-ido-mysql"></a>

The capitalization change in powertools was already done somewhere else on support/2.13, so that change was already included.

fixes #9218
forward-port of #9217

@julianbrost julianbrost added the area/documentation End-user or developer help label Feb 18, 2022
@julianbrost julianbrost added this to the 2.14.0 milestone Feb 18, 2022
@cla-bot cla-bot bot added the cla/signed label Feb 18, 2022
@icinga-probot icinga-probot bot added the blocker Blocks a release or needs immediate attention label Feb 18, 2022
@Al2Klimov Al2Klimov merged commit db321b9 into master Feb 21, 2022
@icinga-probot icinga-probot bot deleted the feature/installation-instructions branch February 21, 2022 15:39
@julianbrost julianbrost added the backported Fix was included in a bugfix release label Mar 30, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/documentation End-user or developer help backported Fix was included in a bugfix release blocker Blocks a release or needs immediate attention cla/signed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Forward-port #9217 into master branch
3 participants