projects
/
carnet-upgrade.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed workaround for apache/php circular depends.
[carnet-upgrade.git]
/
src
/
functions.sh
diff --git
a/src/functions.sh
b/src/functions.sh
index
87d0e92
..
f98489a
100644
(file)
--- a/
src/functions.sh
+++ b/
src/functions.sh
@@
-470,13
+470,8
@@
upgrade_apache () {
#pkgadd apache2-cn php5-cn aosi-aai aosi-www-aai # squirrelmail-cn
pkgadd apache2 apache2-mpm-prefork libapache2-mod-php4 ssl-cert
#pkgadd apache2-cn php5-cn aosi-aai aosi-www-aai # squirrelmail-cn
pkgadd apache2 apache2-mpm-prefork libapache2-mod-php4 ssl-cert
- apt-get install -y -d apache2-cn php4-cn
- apt-get autoclean
- dpkg -i --ignore-depends=apache2-cn \
- /var/cache/apt/archives/apache2-cn_* \
- /var/cache/apt/archives/php4-cn_*
-
- pkgadd aosi-aai aosi-www-aai # squirrelmail-cn
+ pkgadd apache2-cn php4-cn
+ pkgadd aosi-aai aosi-www-aai squirrelmail-cn
}
upgrade_amavis () {
}
upgrade_amavis () {