From 681b8ba9aaa3af8197314afa224ab6f1bb9ef308 Mon Sep 17 00:00:00 2001
From: sorano <sorano@users.noreply.github.com>
Date: Thu, 30 Mar 2017 23:12:51 +0200
Subject: [PATCH] docs: Update install docs to remove deprecated GRANT usage

---
 doc/Installation/Installation-CentOS-6-Apache-Nginx.md | 6 ++----
 doc/Installation/Installation-CentOS-7-Apache.md       | 6 ++----
 doc/Installation/Installation-CentOS-7-Nginx.md        | 6 ++----
 doc/Installation/Installation-Ubuntu-1404-Apache.md    | 6 ++----
 doc/Installation/Installation-Ubuntu-1404-Lighttpd.md  | 6 ++----
 doc/Installation/Installation-Ubuntu-1404-Nginx.md     | 6 ++----
 doc/Installation/Installation-Ubuntu-1604-Apache.md    | 6 ++----
 doc/Installation/Installation-Ubuntu-1604-Nginx.md     | 6 ++----
 8 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/doc/Installation/Installation-CentOS-6-Apache-Nginx.md b/doc/Installation/Installation-CentOS-6-Apache-Nginx.md
index 04f38d7b1b..12c98a1520 100644
--- a/doc/Installation/Installation-CentOS-6-Apache-Nginx.md
+++ b/doc/Installation/Installation-CentOS-6-Apache-Nginx.md
@@ -60,10 +60,8 @@ Create database.
 
 ```sql
 CREATE DATABASE librenms CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-GRANT ALL PRIVILEGES ON librenms.*
-  TO 'librenms'@'<ip>'
-  IDENTIFIED BY '<password>'
-;
+CREATE USER 'librenms'@'localhost' IDENTIFIED BY 'password';
+GRANT ALL PRIVILEGES ON librenms.* TO 'librenms'@'localhost';
 FLUSH PRIVILEGES;
 exit
 ```
diff --git a/doc/Installation/Installation-CentOS-7-Apache.md b/doc/Installation/Installation-CentOS-7-Apache.md
index 0b52e51b88..c930ad2d7f 100644
--- a/doc/Installation/Installation-CentOS-7-Apache.md
+++ b/doc/Installation/Installation-CentOS-7-Apache.md
@@ -14,10 +14,8 @@ mysql -uroot
 
 ```sql
 CREATE DATABASE librenms CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-GRANT ALL PRIVILEGES ON librenms.*
-  TO 'librenms'@'localhost'
-  IDENTIFIED BY '<password>'
-;
+CREATE USER 'librenms'@'localhost' IDENTIFIED BY 'password';
+GRANT ALL PRIVILEGES ON librenms.* TO 'librenms'@'localhost';
 FLUSH PRIVILEGES;
 exit
 ```
diff --git a/doc/Installation/Installation-CentOS-7-Nginx.md b/doc/Installation/Installation-CentOS-7-Nginx.md
index 55964e4dd4..5dd82f9688 100644
--- a/doc/Installation/Installation-CentOS-7-Nginx.md
+++ b/doc/Installation/Installation-CentOS-7-Nginx.md
@@ -14,10 +14,8 @@ mysql -uroot
 
 ```sql
 CREATE DATABASE librenms CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-GRANT ALL PRIVILEGES ON librenms.*
-  TO 'librenms'@'localhost'
-  IDENTIFIED BY '<password>'
-;
+CREATE USER 'librenms'@'localhost' IDENTIFIED BY 'password';
+GRANT ALL PRIVILEGES ON librenms.* TO 'librenms'@'localhost';
 FLUSH PRIVILEGES;
 exit
 ```
diff --git a/doc/Installation/Installation-Ubuntu-1404-Apache.md b/doc/Installation/Installation-Ubuntu-1404-Apache.md
index 72d5d6bbdf..eb3d13a824 100644
--- a/doc/Installation/Installation-Ubuntu-1404-Apache.md
+++ b/doc/Installation/Installation-Ubuntu-1404-Apache.md
@@ -30,10 +30,8 @@ Create the database:
 
 ```sql
 CREATE DATABASE librenms CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-GRANT ALL PRIVILEGES ON librenms.*
-  TO 'librenms'@'<ip>'
-  IDENTIFIED BY '<password>'
-;
+CREATE USER 'librenms'@'localhost' IDENTIFIED BY 'password';
+GRANT ALL PRIVILEGES ON librenms.* TO 'librenms'@'localhost';
 FLUSH PRIVILEGES;
 exit
 ```
diff --git a/doc/Installation/Installation-Ubuntu-1404-Lighttpd.md b/doc/Installation/Installation-Ubuntu-1404-Lighttpd.md
index dfc88105a4..7cc3e20b0d 100644
--- a/doc/Installation/Installation-Ubuntu-1404-Lighttpd.md
+++ b/doc/Installation/Installation-Ubuntu-1404-Lighttpd.md
@@ -29,10 +29,8 @@ Create database.
 
 ```sql
 CREATE DATABASE librenms CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-GRANT ALL PRIVILEGES ON librenms.*
-  TO 'librenms'@'<ip>'
-  IDENTIFIED BY '<password>'
-;
+CREATE USER 'librenms'@'localhost' IDENTIFIED BY 'password';
+GRANT ALL PRIVILEGES ON librenms.* TO 'librenms'@'localhost';
 FLUSH PRIVILEGES;
 exit
 ```
diff --git a/doc/Installation/Installation-Ubuntu-1404-Nginx.md b/doc/Installation/Installation-Ubuntu-1404-Nginx.md
index 020ef8ebf5..27d32df0e1 100644
--- a/doc/Installation/Installation-Ubuntu-1404-Nginx.md
+++ b/doc/Installation/Installation-Ubuntu-1404-Nginx.md
@@ -30,10 +30,8 @@ Create the database:
 
 ```sql
 CREATE DATABASE librenms CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-GRANT ALL PRIVILEGES ON librenms.*
-  TO 'librenms'@'<ip>'
-  IDENTIFIED BY '<password>'
-;
+CREATE USER 'librenms'@'localhost' IDENTIFIED BY 'password';
+GRANT ALL PRIVILEGES ON librenms.* TO 'librenms'@'localhost';
 FLUSH PRIVILEGES;
 exit
 ```
diff --git a/doc/Installation/Installation-Ubuntu-1604-Apache.md b/doc/Installation/Installation-Ubuntu-1604-Apache.md
index b2db16f2d7..8e3955926b 100644
--- a/doc/Installation/Installation-Ubuntu-1604-Apache.md
+++ b/doc/Installation/Installation-Ubuntu-1604-Apache.md
@@ -14,10 +14,8 @@ mysql -uroot -p
 
 ```sql
 CREATE DATABASE librenms CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-GRANT ALL PRIVILEGES ON librenms.*
-  TO 'librenms'@'localhost'
-  IDENTIFIED BY '<password>'
-;
+CREATE USER 'librenms'@'localhost' IDENTIFIED BY 'password';
+GRANT ALL PRIVILEGES ON librenms.* TO 'librenms'@'localhost';
 FLUSH PRIVILEGES;
 exit
 ```
diff --git a/doc/Installation/Installation-Ubuntu-1604-Nginx.md b/doc/Installation/Installation-Ubuntu-1604-Nginx.md
index 3c4e902aa1..5151d9f7aa 100644
--- a/doc/Installation/Installation-Ubuntu-1604-Nginx.md
+++ b/doc/Installation/Installation-Ubuntu-1604-Nginx.md
@@ -14,10 +14,8 @@ mysql -uroot -p
 
 ```sql
 CREATE DATABASE librenms CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-GRANT ALL PRIVILEGES ON librenms.*
-  TO 'librenms'@'localhost'
-  IDENTIFIED BY '<password>'
-;
+CREATE USER 'librenms'@'localhost' IDENTIFIED BY 'password';
+GRANT ALL PRIVILEGES ON librenms.* TO 'librenms'@'localhost';
 FLUSH PRIVILEGES;
 exit
 ```