projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More fixes for apache upgrade function.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
928365f
..
09821a3
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-470,6
+470,16
@@
install_keyrings () {
update
}
update
}
+# remove skey (not supported anymore)
+remove_skey () {
+ pkgrm skey-cn libpam-skey
+
+ if getent group skey > /dev/null; then
+ groupdel skey || true
+ log "groupdel skey"
+ fi
+}
+
# make a silent upgrade to new libc6
upgrade_libc () {
DEBIAN_FRONTEND=noninteractive pkgadd libc6
# make a silent upgrade to new libc6
upgrade_libc () {
DEBIAN_FRONTEND=noninteractive pkgadd libc6
@@
-482,14
+492,31
@@
upgrade_apache () {
mkdir -p /etc/apache2
touch /etc/apache2/httpd.conf
mkdir -p /etc/apache2
touch /etc/apache2/httpd.conf
+ # register cn changes in modules.conf
+ modules_conf=/etc/apache/modules.conf
+ if [ ! -e "$modules_conf.cn4-upgrade" ]; then
+ cp "$modules_conf" "$modules_conf.cn4-upgrade"
+ ucf $modules_conf $modules_conf
+ fi
+
# temporary remove packages conflicting with apache2
delpkg=""
for p in aosi-aai aosi-www-aai \
php4-cn php4-odbc php4-xslt \
squirrelmail-cn; do
# temporary remove packages conflicting with apache2
delpkg=""
for p in aosi-aai aosi-www-aai \
php4-cn php4-odbc php4-xslt \
squirrelmail-cn; do
- pkg p && delpkg="$delpkg $p"
+
+ # remember installed packages
+ if pkg $p; then
+ delpkg="$delpkg $p"
+ fi
done
done
- eval pkgrm $delpkg
+
+ # remove problematic stuff
+ if [ "$delpkg" ]; then
+ eval apt-get --yes remove $delpkg
+ fi
+
+ # remove old apache
pkgrm apache apache-common
# install new packages
pkgrm apache apache-common
# install new packages