From b14a1277cd110aeaf8f0e129a715531d8c1c62b5 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Mon, 1 Mar 2021 19:12:10 +0100 Subject: [PATCH] fix line endings --- mariadb/setup_dbs_different_user.sh | 150 ++++++++++++++-------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/mariadb/setup_dbs_different_user.sh b/mariadb/setup_dbs_different_user.sh index b95de69ad..0d7103a4f 100644 --- a/mariadb/setup_dbs_different_user.sh +++ b/mariadb/setup_dbs_different_user.sh @@ -1,75 +1,75 @@ -#!/bin/bash -COLOR_GREEN="\033[0;32m" -COLOR_YELLOW="\e[33m" -COLOR_NONE="\033[0m" - -LOGIN_DB_USER=gradido_login -LOGIN_DB_NAME=gradido_login -LOGIN_DB_PASSWD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo); - -COMMUNITY_DB_USER=gradido_community -COMMUNITY_DB_NAME=gradido_community -COMMUNITY_DB_PASSWD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo); - -# create table -mysql < .skeema -[production] -flavor=mariadb:10.1.47 -host=127.0.0.1 -port=3306 -user=$LOGIN_DB_USER -EOF -cd gradido_login -sudo cat << EOF > .skeema -default-character-set=utf8mb4 -default-collation=utf8mb4_unicode_ci -schema=$LOGIN_DB_NAME -EOF - -source $HOME/.gvm/scripts/gvm -gvm use go1.14.4 -skeema push -p$LOGIN_DB_PASSWD - -cd ../../.. -# populate db of community-server -cd community-server/skeema -sudo cat << EOF > .skeema -[production] -flavor=mariadb:10.1.47 -host=127.0.0.1 -port=3306 -user=$COMMUNITY_DB_USER -EOF -cd gradido_community -sudo cat << EOF > .skeema -default-character-set=utf8mb4 -default-collation=utf8mb4_unicode_ci -schema=$COMMUNITY_DB_NAME -EOF - -skeema push -p$COMMUNITY_DB_PASSWD - -echo -e "${COLOR_YELLOW}Login-Server db password: $LOGIN_DB_PASSWD${COLOR_NONE}" -echo -e "${COLOR_YELLOW}Community-Server db password: $COMMUNITY_DB_PASSWD${COLOR_NONE}" +#!/bin/bash +COLOR_GREEN="\033[0;32m" +COLOR_YELLOW="\e[33m" +COLOR_NONE="\033[0m" + +LOGIN_DB_USER=gradido_login +LOGIN_DB_NAME=gradido_login +LOGIN_DB_PASSWD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo); + +COMMUNITY_DB_USER=gradido_community +COMMUNITY_DB_NAME=gradido_community +COMMUNITY_DB_PASSWD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32};echo); + +# create table +mysql < .skeema +[production] +flavor=mariadb:10.1.47 +host=127.0.0.1 +port=3306 +user=$LOGIN_DB_USER +EOF +cd gradido_login +sudo cat << EOF > .skeema +default-character-set=utf8mb4 +default-collation=utf8mb4_unicode_ci +schema=$LOGIN_DB_NAME +EOF + +source $HOME/.gvm/scripts/gvm +gvm use go1.14.4 +skeema push -p$LOGIN_DB_PASSWD + +cd ../../.. +# populate db of community-server +cd community-server/skeema +sudo cat << EOF > .skeema +[production] +flavor=mariadb:10.1.47 +host=127.0.0.1 +port=3306 +user=$COMMUNITY_DB_USER +EOF +cd gradido_community +sudo cat << EOF > .skeema +default-character-set=utf8mb4 +default-collation=utf8mb4_unicode_ci +schema=$COMMUNITY_DB_NAME +EOF + +skeema push -p$COMMUNITY_DB_PASSWD + +echo -e "${COLOR_YELLOW}Login-Server db password: $LOGIN_DB_PASSWD${COLOR_NONE}" +echo -e "${COLOR_YELLOW}Community-Server db password: $COMMUNITY_DB_PASSWD${COLOR_NONE}"