albert/Proxmox
1
0
Fork 0
mirror of https://github.com/tteck/Proxmox.git synced 2025-02-15 06:09:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lxc-forgejo: Replace concluding msg_info with msg_ok and remove unnecessary service restart messages for database setups

Browse source
This commit is contained in:
barremian 2024-05-29 00:13:21 +02:00
parent f6ca207f58
commit 5092297a92
No known key found for this signature in database
GPG key ID: 96E431287CDD3E4A
1 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
install/forgejo-install.sh
View file

@ -38,7 +38,7 @@ chown root:git /etc/forgejo && chmod 770 /etc/forgejo
echo "" >>~/forgejo.creds echo "" >>~/forgejo.creds
echo -e "Forgejo GIT User: \e[32mgit\e[0m" >>~/forgejo.creds echo -e "Forgejo GIT User: \e[32mgit\e[0m" >>~/forgejo.creds
echo -e "Forgejo data directory: \e[32m/var/lib/forgejo\e[0m" >>~/forgejo.creds echo -e "Forgejo data directory: \e[32m/var/lib/forgejo\e[0m" >>~/forgejo.creds
msg_info "Setup Forgejo" msg_ok "Setup Forgejo"
msg_info "Setting up database" msg_info "Setting up database"
read -r -p "Forgejo uses SQLite by default. Would you like to use another database? <y/N> " prompt read -r -p "Forgejo uses SQLite by default. Would you like to use another database? <y/N> " prompt
@ -74,10 +74,8 @@ local forgejodb forgejo scram-sha-256
host forgejodb forgejo 127.0.0.1/32 scram-sha-256 # IPv4 local connections host forgejodb forgejo 127.0.0.1/32 scram-sha-256 # IPv4 local connections
host forgejodb forgejo ::1/128 scram-sha-256 # IPv6 local connections host forgejodb forgejo ::1/128 scram-sha-256 # IPv6 local connections
EOL EOL
msg_info "Restarting PostgreSQL"
$STD systemctl restart postgresql $STD systemctl restart postgresql
msg_info "Restarted PostgreSQL" msg_ok "Setup PostgreSQL"
msg_info "Setup PostgreSQL"
fi fi
if [ "$DB_CHOICE" == "MySQL" ]; then if [ "$DB_CHOICE" == "MySQL" ]; then
msg_info "Setting up MySQL" msg_info "Setting up MySQL"
@ -91,10 +89,8 @@ EOL
echo -e "Forgejo MySQL Database Password: \e[32m$DB_PASS\e[0m" >>~/forgejo.creds echo -e "Forgejo MySQL Database Password: \e[32m$DB_PASS\e[0m" >>~/forgejo.creds
echo -e "Forgejo MySQL Database Name: \e[32m$DB_NAME\e[0m" >>~/forgejo.creds 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;" 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;"
msg_info "Restarting MySQL"
$STD systemctl restart mysql $STD systemctl restart mysql
msg_info "Restarted MySQL" msg_ok "Setup MySQL"
msg_info "Setup MySQL"
fi fi
if [ "$DB_CHOICE" == "MariaDB" ]; then if [ "$DB_CHOICE" == "MariaDB" ]; then
msg_info "Setting up MariaDB" msg_info "Setting up MariaDB"
@ -108,10 +104,8 @@ EOL
echo -e "Forgejo MariaDB Database Password: \e[32m$DB_PASS\e[0m" >>~/forgejo.creds echo -e "Forgejo MariaDB Database Password: \e[32m$DB_PASS\e[0m" >>~/forgejo.creds
echo -e "Forgejo MariaDB Database Name: \e[32m$DB_NAME\e[0m" >>~/forgejo.creds 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;" 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;"
msg_info "Restarting MariaDB"
$STD systemctl restart mariadb $STD systemctl restart mariadb
msg_info "Restarted MariaDB" msg_ok "Setup MariaDB"
msg_info "Setup MariaDB"
fi fi
else else
msg_ok "${BL}SQLite${CL} will be used" msg_ok "${BL}SQLite${CL} will be used"