From 62c2da36ccf424f0f9d2327b02b4995d87b03459 Mon Sep 17 00:00:00 2001 From: barremian Date: Wed, 29 May 2024 00:59:11 +0200 Subject: [PATCH] lxc-forgejo: Reintroduce database specific msg outputs --- install/forgejo-install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/install/forgejo-install.sh b/install/forgejo-install.sh index e1f7e48a..9fe75a50 100644 --- a/install/forgejo-install.sh +++ b/install/forgejo-install.sh @@ -50,6 +50,7 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then select DB_CHOICE in "PostgreSQL" "MySQL" "MariaDB"; do case $DB_CHOICE in "PostgreSQL") + msg_info "Setting up PostgreSQL" $STD apt-get install -y postgresql echo "" >>~/forgejo.creds echo -e "Database Type: \e[32mPostgresQL\e[0m" >>~/forgejo.creds @@ -70,9 +71,11 @@ host forgejodb forgejo 127.0.0.1/32 scram-sha-256 # host forgejodb forgejo ::1/128 scram-sha-256 # IPv6 local connections EOL $STD systemctl restart postgresql + msg_ok "Setup PostgreSQL" break ;; "MySQL") + msg_info "Setting up MySQL" $STD apt-get install -y mysql-server ADMIN_PASS="$(openssl rand -base64 18 | cut -c1-13)" echo "" >>~/forgejo.creds @@ -84,9 +87,11 @@ EOL echo -e "Forgejo MySQL Database Name: \e[32m$DB_NAME\e[0m" >>~/forgejo.creds mysql -uroot -p"$ADMIN_PASS" -e "SET old_passwords=0; GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY '$ADMIN_PASS' WITH GRANT OPTION; CREATE USER '$DB_USER' IDENTIFIED BY '$DB_PASS'; CREATE DATABASE $DB_NAME CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci'; GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER' IDENTIFIED BY '$DB_PASS'; FLUSH PRIVILEGES;" $STD systemctl restart mysql + msg_ok "Setup MySQL" break ;; "MariaDB") + msg_info "Setting up MariaDB" $STD apt-get install -y mariadb-server ADMIN_PASS="$(openssl rand -base64 18 | cut -c1-13)" echo "" >>~/forgejo.creds @@ -98,6 +103,7 @@ EOL echo -e "Forgejo MariaDB Database Name: \e[32m$DB_NAME\e[0m" >>~/forgejo.creds mariadb -uroot -p"$ADMIN_PASS" -e "SET old_passwords=0; GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED BY '$ADMIN_PASS' WITH GRANT OPTION; CREATE USER '$DB_USER' IDENTIFIED BY '$DB_PASS'; CREATE DATABASE $DB_NAME CHARACTER SET 'utf8mb4' COLLATE 'utf8mb4_unicode_ci'; GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER' IDENTIFIED BY '$DB_PASS'; FLUSH PRIVILEGES;" $STD systemctl restart mariadb + msg_ok "Setting up MariaDB" break ;; *)