From d8a3822b21d924914532e36e7fb8e4c2cbb3a66e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Tue, 7 Apr 2020 13:20:51 +0200
Subject: [PATCH] DOC: update documentation
---
README_SETUP.md | 19 +++++++++----------
utils/make_db | 4 ++--
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/README_SETUP.md b/README_SETUP.md
index 28ab824..46d4c43 100644
--- a/README_SETUP.md
+++ b/README_SETUP.md
@@ -6,18 +6,17 @@
- make
## Create the configuration
-* Run `./configure`. For the default values and the meaning of these default
- values see [config.defaults](config.defaults). The `configure` script also
- prompts for a (new) user password. Remember that one, since it will be the
- password of the mysql user which is used by the caosdb server. Upon succesful
- completion, the `configure` script writes the configuration to `.config`.
+* Create an empty `.config` file. For the default values and the meaning of these default
+ values see [config.defaults](config.defaults). For each parameter that you
+ want to change, add a corresponding line in your `.config` file. You probably
+ want to change the passwords. As plain password are stored in the `.config` file,
+ make sure nobody else can read it.
* If there is no `mysql-config-editor` (`MySQL 5.5`. and `MariaDB`) then the
- user is prompted for the `MYSQL_USER_PASSWORD`, that is the password of
- the `MYSQL_USER`. The plain password is stored in the `.config` file. So
- make sure nobody else can read it.
+ user is needs to provide the `MYSQL_USER_PASSWORD`, that is the password of
+ the `MYSQL_USER`.
* If you are using MariaDB and the `root` database user uses pam authentication,
- no pasword string is required. When prompted for the `MYSQL_USER_PASSWORD`
- just leave it blank and hit enter. But you need be login as root for the
+ no pasword string is required. You can set the `MYSQL_USER_PASSWORD`
+ to an empty string. But you need to be logged in as root for the
installation and upgrade process.
## Setup the SQL database for CaosDB
diff --git a/utils/make_db b/utils/make_db
index 3ad9311..d13decc 100755
--- a/utils/make_db
+++ b/utils/make_db
@@ -112,8 +112,8 @@ function install_db() {
if _db_exists ; then
echo -e "\n
A database with with the name '$DATABASE_NAME' exists already.
-Call 'make drop-$DATABASE_NAME' to delete that database or reconfigure with
-'./configure'."
+Call 'make drop-$DATABASE_NAME' to delete that database or change the database
+name in your .config file "
exit 0
fi
--
GitLab