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: Move 'read' command above msg_info function call and remove DB specific messages

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

9
install/forgejo-install.sh
View file

@ -40,8 +40,8 @@ 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
msg_ok "Setup Forgejo"
msg_info "Setting up database"
read -r -p "Forgejo uses SQLite by default. Would you like to use another database? <y/N> " prompt
msg_info "Setting up database"
if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
PS3="Please enter your choice: "
files="$(ls -A .)"
@ -54,7 +54,6 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
DB_USER=forgejo
DB_PASS="$(openssl rand -base64 18 | cut -c1-13)"
if [ "$DB_CHOICE" == "PostgreSQL" ]; then
msg_info "Setting up PostgreSQL"
$STD apt-get install -y postgresql
echo "" >>~/forgejo.creds
echo -e "Database Type: \e[32mPostgresQL\e[0m" >>~/forgejo.creds
@ -75,10 +74,8 @@ 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"
fi
if [ "$DB_CHOICE" == "MySQL" ]; then
msg_info "Setting up MySQL"
$STD apt-get install -y mysql-server
ADMIN_PASS="$(openssl rand -base64 18 | cut -c1-13)"
echo "" >>~/forgejo.creds
@ -90,10 +87,8 @@ 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"
fi
if [ "$DB_CHOICE" == "MariaDB" ]; then
msg_info "Setting up MariaDB"
$STD apt-get install -y mariadb-server
ADMIN_PASS="$(openssl rand -base64 18 | cut -c1-13)"
echo "" >>~/forgejo.creds
@ -105,8 +100,8 @@ 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 "Setup MariaDB"
fi
msg_ok "${BL}${DB_CHOICE}${CL} will be used"
else
msg_ok "${BL}SQLite${CL} will be used"
fi