TEMPORAIRE: Tentative installation module Apache php5, mais segfault

[hvlinux.git] / stage5 / hv-install-1

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 857d31e..41f864b 100755 (executable)
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -180,6 +180,9 @@ ipkg ${XARCHIVER}
 ipkg -m acnb ${LIBFM}
 ipkg ${PCMANFM}
 
+ipkg -s apache ${HTTPD} # Apache
+ipkg ${PHP}
+
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg -m noac ${PROCMAIL}
     ipkg -m noac ${LIBSPF2}
@@ -200,18 +203,12 @@ if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
 
     ipkg ${UW_IMAP}
 
-    ipkg ${HTTPD} # Apache
-    ipkg ${PHP}
-
     ipkg -m noac ${SQUIRRELMAIL}
     ipkg ${FETCHMAIL} "--with-ssl"
 
     # Subversion server (client was already installed in stage2)
     ipkg ${SUBVERSION}
-fi
 
-if [ "x${INST_TYPE}" = "xworkstation" -o \
-    "x${INST_TYPE}" = "xltsp-server" ]; then
     ipkg ${LIBGSF}
     ipkg -m acnb ${GOFFICE}
     ipkg ${GNUMERIC} "--localstatedir=/var/lib --disable-pdfdocs"