From fd4c1bd48970f71336777a7865c420690c82138c Mon Sep 17 00:00:00 2001
From: Yaco <franco@reevo.org>
Date: Wed, 14 Apr 2021 17:10:13 -0300
Subject: correcciones

---
 .gitignore |  7 +++++--
 README.md  | 14 ++------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index c645a3c6..5df0b2fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,6 +14,7 @@ log/wiki/*
 !log/admin/.gitkeep
 !log/crm/.gitkeep
 !log/wiki/.gitkeep
+!log/crm/ConfigAndLog/.gitkeep
 
 etc/global_config.php
 etc/nginx/*
@@ -33,10 +34,10 @@ files/wiki/*
 
 tmp/crm/*
 !tmp/crm/.gitkeep
-tmp/wiki/*
-!tmp/wiki/.gitkeep
 tmp/wiki/cache/*
 !tmp/wiki/cache/.gitkeep
+tmp/wiki/*
+!tmp/wiki/.gitkeep
 
 www/wiki/LocalSettings.php
 www/wiki/robots.txt
@@ -49,3 +50,5 @@ www/crm/wp-content/uploads/civicrm/templates_c/*
 www/crm/wp-content/uploads/civicrm/upload/cache/*
 !www/crm/wp-content/uploads/civicrm/upload/cache/.gitkeep
 www/crm/wp-content/uploads/civicrm/upload/*
+!www/crm/wp-content/uploads/civicrm/ConfigAndLog/.gitkeep
+www/crm/wp-content/uploads/civicrm/ConfigAndLog/*
diff --git a/README.md b/README.md
index f7c15a42..16891ecf 100644
--- a/README.md
+++ b/README.md
@@ -24,20 +24,10 @@ Luego creamos los archivos de configuracion en /etc
 
 #### Crear base de datos
 
-En la consola de MYSQL:
-
-```
-CREATE DATABASE reevo2020_wiki;
-
-CREATE USER 'reevo2020'@'localhost' IDENTIFIED BY 'my-strong-password-here';
-
-GRANT INDEX, SELECT, INSERT, UPDATE, DELETE, CREATE, DROP, ALTER, CREATE TEMPORARY TABLES, LOCK TABLES ON reevo2020_wiki.* TO 'reevo2020'@'localhost';
-```
-
-Para generar las tablas en la base de datos hacemos (no usamos el ```LocalSettings.php``` resultante):
+Para crear ka base de datos y generar las tablas en la base de datos hacemos (no usamos el ```LocalSettings.php``` resultante):
 
 ~~~
-php www/wiki/maintenance/install.php --dbname=reevo2020_wiki --dbserver="localhost" --installdbuser=reevo2020 --installdbpass=<password> --dbuser=reevo2020_wiki --dbpass=<password> --server="http://reevo.red" --scriptpath=/ --lang=es --pass=yaco22 "REEVO" "Admin" --confpath /var/dump
+php www/wiki/maintenance/install.php --dbname=reevo2020_wiki --dbserver="localhost" --installdbuser=root --installdbpass=<root_password> --dbuser=reevo2020_wiki --dbpass=<password> --server="http://reevo.red" --scriptpath=/ --lang=es --pass=yaco22 "REEVO" "Admin" --confpath /var/dump
 ~~~
 
 Cargamos los datos para conectar con la base de datos en ```etc/global_config.php```.
-- 
cgit v1.2.1