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:
64fe5d7
)
Always try to restore apache configs.
author
Valentin Vidic
<vvidic@carnet.hr>
Wed, 20 Feb 2008 15:16:39 +0000
(16:16 +0100)
committer
Valentin Vidic
<vvidic@carnet.hr>
Wed, 20 Feb 2008 15:16:39 +0000
(16:16 +0100)
src/functions.sh
patch
|
blob
|
history
diff --git
a/src/functions.sh
b/src/functions.sh
index
168bc91
..
80e1894
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-523,6
+523,20
@@
restore_configs () {
rm -vf "$file"
done
fi
rm -vf "$file"
done
fi
+
+ # register cn changes in apache files
+ for config in /etc/php4/cgi/php.ini \
+ /etc/php4/cli/php.ini \
+ /etc/php4/apache/php.ini \
+ /etc/php4/apache2/php.ini \
+ /etc/apache/modules.conf
+ do
+ config_backup=$config.$backup_ext
+ if [ -e $config -a ! -e $config_backup ]; then
+ cp -av $config $config_backup
+ ucf $config_backup $config
+ fi
+ done
}
# temporary disable listchanges packages to reduce clutter during upgrade
}
# temporary disable listchanges packages to reduce clutter during upgrade
@@
-597,20
+611,6
@@
upgrade_apache () {
eval apt-get --yes remove $delpkg
fi
eval apt-get --yes remove $delpkg
fi
- # register cn changes in apache files
- for config in /etc/php4/cgi/php.ini \
- /etc/php4/cli/php.ini \
- /etc/php4/apache/php.ini \
- /etc/php4/apache2/php.ini \
- /etc/apache/modules.conf
- do
- config_backup=$config.$backup_ext
- if [ ! -e $config_backup ]; then
- cp -av $config $config_backup
- ucf $config_backup $config
- fi
- done
-
# remove old apache
pkgrm apache apache-common
# remove old apache
pkgrm apache apache-common