diff --git a/README_SETUP.md b/README_SETUP.md index 28ab8241d2083be612a1156adbbf493a4268d79b..46d4c43f78f4f5331fc334a0ef1a99ccc898f940 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 3ad93111287a4b87303f5c7b319f7da4afd5e282..d13decc151fee628c5570f8678f6789acabc2fd7 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