-Ajout option pour serveur web

-Ajout option pour GNASH
-Enlevé modemmanager

diff --git a/ubuntu/ubuntu-cfg.sh b/ubuntu/ubuntu-cfg.sh
index 805b5a1..ef37242 100755 (executable)
--- a/ubuntu/ubuntu-cfg.sh
+++ b/ubuntu/ubuntu-cfg.sh
@@ -76,6 +76,10 @@ if dpkg --list | grep "vinagre" 1> /dev/null 2>&1; then
     ${APT} remove --purge vinagre
 fi
 
+if dpkg --list | grep "modemmanager" 1> /dev/null 2>&1; then
+    ${APT} remove --purge modemmanager
+fi
+
 # Braille
 if dpkg --list | grep "brltty" 1> /dev/null 2>&1; then
     ${APT} remove --purge brltty
@@ -216,6 +220,10 @@ if [ "x${INSTALL_DEV_TOOLS}" = "x1" ]; then
     ${AGI} dh-make lintian dupload
 fi
 
+if [ "x${INSTALL_WEB_SERVER}" = "x1" ]; then
+    ${AGI} libapache2-mod-php5
+fi
+
 ${AGI} abiword gnumeric gnumeric-plugins-extra
 ${AGI} texlive texlive-latex-recommended texlive-latex-extra texlive-humanities
 
@@ -255,7 +263,9 @@ ${AGI} ${GST}-ffmpeg ${GST}-plugins-bad ${GST}-plugins-ugly ${GST}-fluendo-mp3
 ${AGI} libavcodec-extra-52
 hv_add_repo "ppa:stebbins/handbrake-snapshots"
 ${AGI} handbrake-cli
-${AGI} mozilla-plugin-gnash # Requires "mysql-common"
+if [ "x${INSTALL_GNASH}" = "x1" ]; then
+    ${AGI} mozilla-plugin-gnash # Requires "mysql-common"
+fi
 if [ -h /dev/cdrom ]; then # Don't install on machines without CD/DVD-ROM
 ${AGI} vlc mozilla-plugin-vlc
     ${AGI} sound-juicer