projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed proftpd from service check list.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
27c6133
..
7c6aab7
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-286,7
+286,7
@@
check_apache_version () {
if pkg apache-cn && ! pkg apache2-cn; then
notice "
if pkg apache-cn && ! pkg apache2-cn; then
notice "
-Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa apache 1.3 na apache 2.0.
+Prije prelaska na Debian Etch potrebno je napraviti nadogradnju sa Apache 1.3 na Apache 2.0.
Pokrenite:
'apt-get install apache2-cn'
Pokrenite:
'apt-get install apache2-cn'
@@
-539,6
+539,7
@@
restore_configs () {
do
config_backup=$config.$backup_ext
if [ -e $config -a ! -e $config_backup ]; then
do
config_backup=$config.$backup_ext
if [ -e $config -a ! -e $config_backup ]; then
+ log "Saving config file $config"
cp -av $config $config_backup
ucf $config_backup $config
fi
cp -av $config $config_backup
ucf $config_backup $config
fi
@@
-706,6
+707,16
@@
upgrade_dovecot () {
fi
}
fi
}
+# vsftpd.postinst tries to start vsftpd so make sure it is not running
+upgrade_vsftpd () {
+ if [ -x /etc/init.d/vsftpd ]; then
+ /etc/init.d/vsftpd stop || true
+ fi
+
+ pkg vsftpd && pkgadd vsftpd
+ pkg vsftpd-cn && pkgadd vsftpd-cn
+}
+
# fix /etc/dpkg/dpkg.cfg
comment_force_overwrite () {
if [ -f /etc/dpkg/dpkg.cfg ]; then
# fix /etc/dpkg/dpkg.cfg
comment_force_overwrite () {
if [ -f /etc/dpkg/dpkg.cfg ]; then