projects
/
carnet-upgrade.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e964d27
)
modifikacije functions.sh za MariaDB 10.3 i PHP7.3
author
Zeljko Boros
<Zeljko.Boros@carnet.hr>
Mon, 26 Apr 2021 12:33:38 +0000
(14:33 +0200)
committer
Zeljko Boros
<Zeljko.Boros@carnet.hr>
Mon, 26 Apr 2021 12:33:38 +0000
(14:33 +0200)
src/functions.sh
patch
|
blob
|
history
diff --git
a/src/functions.sh
b/src/functions.sh
index
9100f66
..
3825a4c
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-2,6
+2,9
@@
# Zoran 'jelly' Dzelajlija <jelly@srce.hr>
# Zeljko Boros <zelja@carnet.hr>
# Zoran 'jelly' Dzelajlija <jelly@srce.hr>
# Zeljko Boros <zelja@carnet.hr>
+PHPVER="7.3"
+MDB="10.3"
+
notice () {
LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75
}
notice () {
LC_MESSAGES=hr_HR dialog --backtitle "$title" --msgbox "$*" 18 75
}
@@
-869,11
+872,12
@@
pkgupgrade () {
fi
}
fi
}
-# upgrade apache2/pthp5
+# upgrade apache2/php
upgrade_apache2 () {
upgrade_apache2 () {
- pkgrm apache-common # prevents installation of apache2-suexec
- pkgupgrade libapache2-mod-php7.0 php7.0-cli php7.0-cn apache2-cn \
- php7.0-odbc mod-security-cn
+### ne treba od etcha
+### pkgrm apache-common # prevents installation of apache2-suexec
+ pkgupgrade libapache2-mod-php$PHPVER php$PHPVER-cli php$PHPVER-cn apache2-cn \
+ php$PHPVER-odbc mod-security-cn
}
upgrade_amavis () {
}
upgrade_amavis () {
@@
-912,10
+916,10
@@
upgrade_amavis () {
# handle mysql upgrade
upgrade_mysql () {
if pkg mysql-server || pkg mysql-server-5.5 || \
# handle mysql upgrade
upgrade_mysql () {
if pkg mysql-server || pkg mysql-server-5.5 || \
- pkg mariadb-server || pkg mariadb-server-10.0
+ pkg mariadb-server || pkg mariadb-server-$MDB
then
pkgadd default-mysql-server
then
pkgadd default-mysql-server
- dpkg -P mysql-server mysql-server-5.5 mariadb-server-10.0
+ dpkg -P mysql-server mysql-server-5.5 mariadb-server-$MDB
service mysql restart
fi
}
service mysql restart
fi
}