From 91f34fba34908d0d517fb25264d04aa5c26cedca Mon Sep 17 00:00:00 2001
From: Yaarit Hatuka <yaarit@redhat.com>
Date: Tue, 15 Mar 2022 20:40:53 -0400
Subject: [PATCH] review fixes - will be squashed

Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
---
 INSTALL.md | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index dc824d7..3ac47b8 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -33,11 +33,11 @@ sudo find /opt/telemetry_grafana/etc/grafana_dashboards/ -name "*.json" -exec se
 ```
 
 2. Edit the docker-compose template `install/docker-compose.yml`. Change the following:
-   - <postgres_password> : Choose a password for the database "postgres" user, which is the PostgerSQL super user
-   - <postgres_host_storage_path> : presistant storage for the database files
-   - <telemetry_server_FQDN> : FQDN of the server on which the Grafana is running
-   - /opt/telemetry_grafana : presistant storage basedir for the Grafana database files
-3. Run `cd install; docker-compose up -d` in the same directory as the docker-compose.yml  
+   - <postgres_password> : Choose a password for the database "postgres" user, which is the PostgreSQL super user
+   - <postgres_host_storage_path> : persistent storage for the database files
+   - <telemetry_server_FQDN> : FQDN of the server on which Grafana is running
+   - /opt/telemetry_grafana : persistent storage basedir for the Grafana database files
+3. Run `cd install; docker-compose up -d`
 
 ### Provision database
 #### Create roles, passwords, and data source names (DSN)
@@ -81,7 +81,6 @@ psql -v ON_ERROR_STOP=1 -b -h 127.0.0.1 -U grafana telemetry < db_create_dashboa
 1. run:
 ```bash
 sudo dnf install -y httpd python3-mod_wsgi mod_ssl mod_evasive openssl python3-requests python3-flask python3-flask-restful python3-psycopg2 lz4
-# sudo systemctl enable --now httpd
 sudo cp ~/ceph-telemetry/install/telemetry-ssl.conf /etc/httpd/conf.d/
 ```
 2. Generate web server certificates for the telemetry server's public FQDN. Below instructions are of how to generate self-signed certificates that should not be used in production
@@ -93,6 +92,10 @@ sudo openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/telemetry/ssl/teleme
    - ServerName
    - SSLCertificateFile, SSLCertificateKeyFile
 4. You may need to configure SELinux to allow httpd access to the telemetry wsgi using `semanage permissive -a httpd_t`
+5. run:
+```bash
+sudo systemctl enable --now httpd
+```
 
 ## Install the Telemetry server
 run:
@@ -116,6 +119,8 @@ sudo crontab -u telemetry install/crontab_telemetry
 # Backing up the Telemetry server
 Backing up the server involves backing up the PostgreSQL database by running
 ```bash
-PGPASSWORD=<POSTGRESS PASSWORD> pg_dumpall postgres | lz4 -c" > telemetry_server.sql.lz4
+PGPASSWORD=<postgres_password> pg_dumpall postgres | lz4 -c > telemetry_server.sql.lz4
 ```
 and then copying the resultant file out of the telemetry server host.
+Please note that <postgres_password> is the same as in the docker-compose.yml
+file.