Skip to content

Commit 6779ac3

Browse files
jaapmarcusjaapmarcus
authored
Rename Mysql Classic to Mysql8 (hestiacp#3568)
* Rename Mysql Classic to Mysql8 * Set $BIN var in installer * Update Ubuntu Installer * Update install.md
1 parent 5cc0243 commit 6779ac3

File tree

3 files changed

+59
-52
lines changed

3 files changed

+59
-52
lines changed

‎docs/_data/options.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ export const options: OptionsListItem[] = [
8080
conflicts: "mysql8",
8181
},
8282
{
83-
name: " --mysql-classic",
83+
name: " --mysql8",
8484
id: "mysql8",
85-
param: "--mysql-classic",
85+
param: "--mysql8",
8686
desc: "Install Mysql8.",
8787
selected: false,
8888
conflicts: "mysql",

‎install/hst-install-debian.sh‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ help() {
6161
-j, --proftpd Install ProFTPD [yes|no] default: no
6262
-k, --named Install Bind [yes|no] default: yes
6363
-m, --mysql Install MariaDB [yes|no] default: yes
64-
-M, --mysql-classic Install MySQL [yes|no] default: no
64+
-M, --mysql8 Install MySQL [yes|no] default: no
6565
-g, --postgresql Install PostgreSQL [yes|no] default: no
6666
-x, --exim Install Exim [yes|no] default: yes
6767
-z, --dovecot Install Dovecot [yes|no] default: yes
@@ -203,7 +203,9 @@ for arg; do
203203
--proftpd) args="${args}-j " ;;
204204
--named) args="${args}-k " ;;
205205
--mysql) args="${args}-m " ;;
206+
--mariadb) args="${args}-m " ;;
206207
--mysql-classic) args="${args}-M " ;;
208+
--mysql8) args="${args}-M " ;;
207209
--postgresql) args="${args}-g " ;;
208210
--exim) args="${args}-x " ;;
209211
--dovecot) args="${args}-z " ;;
@@ -235,34 +237,34 @@ eval set -- "$args"
235237
# Parsing arguments
236238
while getopts "a:w:v:j:k:m:M:g:d:x:z:Z:c:t:i:b:r:o:q:l:y:s:e:p:D:fh" Option; do
237239
case $Option in
238-
a) apache=$OPTARG ;; # Apache
239-
w) phpfpm=$OPTARG ;; # PHP-FPM
240-
o) multiphp=$OPTARG ;; # Multi-PHP
241-
v) vsftpd=$OPTARG ;; # Vsftpd
242-
j) proftpd=$OPTARG ;; # Proftpd
243-
k) named=$OPTARG ;; # Named
244-
m) mysql=$OPTARG ;; # MariaDB
245-
M) mysqlclassic=$OPTARG ;; # MySQL
246-
g) postgresql=$OPTARG ;; # PostgreSQL
247-
x) exim=$OPTARG ;; # Exim
248-
z) dovecot=$OPTARG ;; # Dovecot
249-
Z) sieve=$OPTARG ;; # Sieve
250-
c) clamd=$OPTARG ;; # ClamAV
251-
t) spamd=$OPTARG ;; # SpamAssassin
252-
i) iptables=$OPTARG ;; # Iptables
253-
b) fail2ban=$OPTARG ;; # Fail2ban
254-
q) quota=$OPTARG ;; # FS Quota
255-
r) port=$OPTARG ;; # Backend Port
256-
l) lang=$OPTARG ;; # Language
257-
d) api=$OPTARG ;; # Activate API
258-
y) interactive=$OPTARG ;; # Interactive install
259-
s) servername=$OPTARG ;; # Hostname
260-
e) email=$OPTARG ;; # Admin email
261-
p) vpass=$OPTARG ;; # Admin password
262-
D) withdebs=$OPTARG ;; # Hestia debs path
263-
f) force='yes' ;; # Force install
264-
h) help ;; # Help
265-
*) help ;; # Print help (default)
240+
a) apache=$OPTARG ;; # Apache
241+
w) phpfpm=$OPTARG ;; # PHP-FPM
242+
o) multiphp=$OPTARG ;; # Multi-PHP
243+
v) vsftpd=$OPTARG ;; # Vsftpd
244+
j) proftpd=$OPTARG ;; # Proftpd
245+
k) named=$OPTARG ;; # Named
246+
m) mysql=$OPTARG ;; # MariaDB
247+
M) mysql8=$OPTARG ;; # MySQL
248+
g) postgresql=$OPTARG ;; # PostgreSQL
249+
x) exim=$OPTARG ;; # Exim
250+
z) dovecot=$OPTARG ;; # Dovecot
251+
Z) sieve=$OPTARG ;; # Sieve
252+
c) clamd=$OPTARG ;; # ClamAV
253+
t) spamd=$OPTARG ;; # SpamAssassin
254+
i) iptables=$OPTARG ;; # Iptables
255+
b) fail2ban=$OPTARG ;; # Fail2ban
256+
q) quota=$OPTARG ;; # FS Quota
257+
r) port=$OPTARG ;; # Backend Port
258+
l) lang=$OPTARG ;; # Language
259+
d) api=$OPTARG ;; # Activate API
260+
y) interactive=$OPTARG ;; # Interactive install
261+
s) servername=$OPTARG ;; # Hostname
262+
e) email=$OPTARG ;; # Admin email
263+
p) vpass=$OPTARG ;; # Admin password
264+
D) withdebs=$OPTARG ;; # Hestia debs path
265+
f) force='yes' ;; # Force install
266+
h) help ;; # Help
267+
*) help ;; # Print help (default)
266268
esac
267269
done
268270

@@ -316,7 +318,7 @@ fi
316318
if [ "$apache" = 'no' ]; then
317319
phpfpm='yes'
318320
fi
319-
if [ "$mysql" = 'yes' ] && [ "$mysqlclassic" = 'yes' ]; then
321+
if [ "$mysql" = 'yes' ] && [ "$mysql8" = 'yes' ]; then
320322
mysql='no'
321323
fi
322324

@@ -564,7 +566,7 @@ echo
564566
if [ "$mysql" = 'yes' ]; then
565567
echo ' - MariaDB Database Server'
566568
fi
567-
if [ "$mysqlclassic" = 'yes' ]; then
569+
if [ "$mysql8" = 'yes' ]; then
568570
echo ' - MySQL8 Database Server'
569571
fi
570572
if [ "$postgresql" = 'yes' ]; then
@@ -726,7 +728,7 @@ if [ "$mysql" = 'yes' ]; then
726728
fi
727729

728730
# Installing Mysql8 repo
729-
if [ "$mysqlclassic" = 'yes' ]; then
731+
if [ "$mysql8" = 'yes' ]; then
730732
echo "[ * ] Mysql 8"
731733
echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/mysql-keyring.gpg] http://repo.mysql.com/apt/debian/ $codename mysql-apt-config" >> /etc/apt/sources.list.d/mysql.list
732734
echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/mysql-keyring.gpg] http://repo.mysql.com/apt/debian/ $codename mysql-8.0" >> /etc/apt/sources.list.d/mysql.list
@@ -910,12 +912,12 @@ if [ "$mysql" = 'no' ]; then
910912
software=$(echo "$software" | sed -e "s/mariadb-client//")
911913
software=$(echo "$software" | sed -e "s/mariadb-common//")
912914
fi
913-
if [ "$mysqlclassic" = 'no' ]; then
915+
if [ "$mysql8" = 'no' ]; then
914916
software=$(echo "$software" | sed -e "s/mysql-server//")
915917
software=$(echo "$software" | sed -e "s/mysql-client//")
916918
software=$(echo "$software" | sed -e "s/mysql-common//")
917919
fi
918-
if [ "$mysql" = 'no' ] && [ "$mysqlclassic" = 'no' ]; then
920+
if [ "$mysql" = 'no' ] && [ "$mysql8" = 'no' ]; then
919921
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
920922
fi
921923
if [ "$postgresql" = 'no' ]; then
@@ -1139,7 +1141,7 @@ if [ "$phpfpm" = 'yes' ]; then
11391141
fi
11401142

11411143
# Database stack
1142-
if [ "$mysql" = 'yes' ] || [ "$mysqlclassic" = 'yes' ]; then
1144+
if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
11431145
installed_db_types='mysql'
11441146
fi
11451147
if [ "$postgresql" = 'yes' ]; then
@@ -1512,7 +1514,7 @@ fi
15121514
# Configure MariaDB / MySQL #
15131515
#----------------------------------------------------------#
15141516

1515-
if [ "$mysql" = 'yes' ] || [ "$mysqlclassic" = 'yes' ]; then
1517+
if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
15161518
[ "$mysql" = 'yes' ] && mysql_type="MariaDB" || mysql_type="MySQL"
15171519
echo "[ * ] Configuring $mysql_type database server..."
15181520
mycnf="my-small.cnf"
@@ -1590,7 +1592,7 @@ fi
15901592
# shellcheck source=/usr/local/hestia/install/upgrade/upgrade.conf
15911593
source $HESTIA/install/upgrade/upgrade.conf
15921594

1593-
if [ "$mysql" = 'yes' ] || [ "$mysqlclassic" = 'yes' ]; then
1595+
if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
15941596
# Display upgrade information
15951597
echo "[ * ] Installing phpMyAdmin version v$pma_v..."
15961598

@@ -1870,7 +1872,7 @@ if [ "$fail2ban" = 'yes' ]; then
18701872
fi
18711873

18721874
# Configuring MariaDB/MySQL host
1873-
if [ "$mysql" = 'yes' ] || [ "$mysqlclassic" = 'yes' ]; then
1875+
if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
18741876
$HESTIA/bin/v-add-database-host mysql localhost root $mpass
18751877
fi
18761878

@@ -1884,7 +1886,7 @@ fi
18841886
#----------------------------------------------------------#
18851887

18861888
# Min requirements Dovecot + Exim + Mysql
1887-
if ([ "$mysql" == 'yes' ] || [ "$mysqlclassic" == 'yes' ]) && [ "$dovecot" == "yes" ]; then
1889+
if ([ "$mysql" == 'yes' ] || [ "$mysql8" == 'yes' ]) && [ "$dovecot" == "yes" ]; then
18881890
echo "[ * ] Install Roundcube..."
18891891
$HESTIA/bin/v-add-sys-roundcube
18901892
write_config_value "WEBMAIL_ALIAS" "webmail"
@@ -2097,6 +2099,8 @@ echo "@reboot root sleep 10 && rm /etc/cron.d/hestia-ssl && PATH='/usr/local/sbi
20972099
#----------------------------------------------------------#
20982100

20992101
echo "[ * ] Updating configuration files..."
2102+
2103+
BIN="$HESTIA/bin"
21002104
source $HESTIA/func/syshealth.sh
21012105
syshealth_repair_system_config
21022106

‎install/hst-install-ubuntu.sh‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ help() {
6161
-j, --proftpd Install ProFTPD [yes|no] default: no
6262
-k, --named Install Bind [yes|no] default: yes
6363
-m, --mysql Install MariaDB [yes|no] default: yes
64-
-M, --mysql-classic Install MySQL [yes|no] default: no
64+
-M, --mysql8 Install MySQL [yes|no] default: no
6565
-g, --postgresql Install PostgreSQL [yes|no] default: no
6666
-x, --exim Install Exim [yes|no] default: yes
6767
-z, --dovecot Install Dovecot [yes|no] default: yes
@@ -203,7 +203,9 @@ for arg; do
203203
--proftpd) args="${args}-j " ;;
204204
--named) args="${args}-k " ;;
205205
--mysql) args="${args}-m " ;;
206+
--mariadb) args="${args}-m " ;;
206207
--mysql-classic) args="${args}-M " ;;
208+
--mysql8) args="${args}-M " ;;
207209
--postgresql) args="${args}-g " ;;
208210
--exim) args="${args}-x " ;;
209211
--dovecot) args="${args}-z " ;;
@@ -275,7 +277,7 @@ set_default_value 'vsftpd' 'yes'
275277
set_default_value 'proftpd' 'no'
276278
set_default_value 'named' 'yes'
277279
set_default_value 'mysql' 'yes'
278-
set_default_value 'mysqlclassic' 'no'
280+
set_default_value 'mysql8' 'no'
279281
set_default_value 'postgresql' 'no'
280282
set_default_value 'exim' 'yes'
281283
set_default_value 'dovecot' 'yes'
@@ -316,7 +318,7 @@ fi
316318
if [ "$apache" = 'no' ]; then
317319
phpfpm='yes'
318320
fi
319-
if [ "$mysql" = 'yes' ] && [ "$mysqlclassic" = 'yes' ]; then
321+
if [ "$mysql" = 'yes' ] && [ "$mysql8" = 'yes' ]; then
320322
mysql='no'
321323
fi
322324

@@ -553,7 +555,7 @@ echo
553555
if [ "$mysql" = 'yes' ]; then
554556
echo ' - MariaDB Database Server'
555557
fi
556-
if [ "$mysqlclassic" = 'yes' ]; then
558+
if [ "$mysql8" = 'yes' ]; then
557559
echo ' - MySQL8 Database Server'
558560
fi
559561
if [ "$postgresql" = 'yes' ]; then
@@ -882,12 +884,12 @@ if [ "$mysql" = 'no' ]; then
882884
software=$(echo "$software" | sed -e "s/mariadb-client//")
883885
software=$(echo "$software" | sed -e "s/mariadb-common//")
884886
fi
885-
if [ "$mysqlclassic" = 'no' ]; then
887+
if [ "$mysql8" = 'no' ]; then
886888
software=$(echo "$software" | sed -e "s/mysql-server//")
887889
software=$(echo "$software" | sed -e "s/mysql-client//")
888890
software=$(echo "$software" | sed -e "s/mysql-common//")
889891
fi
890-
if [ "$mysql" = 'no' ] && [ "$mysqlclassic" = 'no' ]; then
892+
if [ "$mysql" = 'no' ] && [ "$mysql8" = 'no' ]; then
891893
software=$(echo "$software" | sed -e "s/php$fpm_v-mysql//")
892894
if [ "$multiphp" = 'yes' ]; then
893895
for v in "${multiphp_v[@]}"; do
@@ -1170,7 +1172,7 @@ if [ "$phpfpm" = 'yes' ] || [ "$multiphp" = 'yes' ]; then
11701172
fi
11711173

11721174
# Database stack
1173-
if [ "$mysql" = 'yes' ] || [ "$mysqlclassic" = 'yes' ]; then
1175+
if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
11741176
installed_db_types='mysql'
11751177
fi
11761178
if [ "$postgresql" = 'yes' ]; then
@@ -1551,7 +1553,7 @@ fi
15511553
# Configure MariaDB / MySQL #
15521554
#----------------------------------------------------------#
15531555

1554-
if [ "$mysql" = 'yes' ] || [ "$mysqlclassic" = 'yes' ]; then
1556+
if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
15551557
[ "$mysql" = 'yes' ] && mysql_type="MariaDB" || mysql_type="MySQL"
15561558
echo "[ * ] Configuring $mysql_type database server..."
15571559
mycnf="my-small.cnf"
@@ -1629,7 +1631,7 @@ fi
16291631
# shellcheck source=/usr/local/hestia/install/upgrade/upgrade.conf
16301632
source $HESTIA/install/upgrade/upgrade.conf
16311633

1632-
if [ "$mysql" = 'yes' ] || [ "$mysqlclassic" = 'yes' ]; then
1634+
if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
16331635
# Display upgrade information
16341636
echo "[ * ] Installing phpMyAdmin version v$pma_v..."
16351637

@@ -1894,7 +1896,7 @@ if [ "$fail2ban" = 'yes' ]; then
18941896
fi
18951897

18961898
# Configuring MariaDB/MySQL host
1897-
if [ "$mysql" = 'yes' ] || [ "$mysqlclassic" = 'yes' ]; then
1899+
if [ "$mysql" = 'yes' ] || [ "$mysql8" = 'yes' ]; then
18981900
$HESTIA/bin/v-add-database-host mysql localhost root $mpass
18991901
fi
19001902

@@ -1908,7 +1910,7 @@ fi
19081910
#----------------------------------------------------------#
19091911

19101912
# Min requirements Dovecot + Exim + Mysql
1911-
if ([ "$mysql" == 'yes' ] || [ "$mysqlclassic" == 'yes' ]) && [ "$dovecot" == "yes" ]; then
1913+
if ([ "$mysql" == 'yes' ] || [ "$mysql8" == 'yes' ]) && [ "$dovecot" == "yes" ]; then
19121914
echo "[ * ] Install Roundcube..."
19131915
$HESTIA/bin/v-add-sys-roundcube
19141916
write_config_value "WEBMAIL_ALIAS" "webmail"
@@ -2136,6 +2138,7 @@ echo "@reboot root sleep 10 && rm /etc/cron.d/hestia-ssl && PATH='/usr/local/sbi
21362138
#----------------------------------------------------------#
21372139

21382140
echo "[ * ] Updating configuration files..."
2141+
BIN="$HESTIA/bin"
21392142
source $HESTIA/func/syshealth.sh
21402143
syshealth_repair_system_config
21412144

0 commit comments

Comments
 (0)