From 373ffc4e09a7f7e2af363a2caf5a1cf489a1c4a8 Mon Sep 17 00:00:00 2001
From: Valentin Lab <valentin.lab@kalysto.org>
Date: Thu, 17 Mar 2016 16:13:38 +0800
Subject: [PATCH] chg: [www] replacing ``pecl`` commands by equivalent
 ``apt-get`` command.

---
 precise/www/hooks/install | 62 +++++++++++++++++++++++----------------
 precise/www/metadata.yaml |  2 ++
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/precise/www/hooks/install b/precise/www/hooks/install
index 4e40559..c4a1ec4 100755
--- a/precise/www/hooks/install
+++ b/precise/www/hooks/install
@@ -1,57 +1,69 @@
 #!/bin/bash
 
-set -eux 
+set -eux
 
 
-apt-get -y install apache2 libapache2-mod-php5 libtidy-0.99-0 build-essential 
-apt-get -y install php5-dev php5-ldap php5-xsl php-pear 
+apt-get -y install apache2 libapache2-mod-php5 libtidy-0.99-0 build-essential </dev/null
+
+apt-get -y install php5-dev php5-ldap php5-xsl php-pear </dev/null
 ## Couldn't find this one:
-#php-mcrypt 
-apt-get -y install libapache2-mod-python  libmysqlclient-dev python-dev
-apt-get -y install php5-mysql
-apt-get -y install python-docutils  ## for rst2html
+#php-mcrypt
+apt-get -y install libapache2-mod-python  libmysqlclient-dev python-dev </dev/null
+apt-get -y install php5-mysql </dev/null
+apt-get -y install python-docutils </dev/null ## for rst2html
 
 
 #apt-get install squirrelmail
-apt-get -y install phpmyadmin
 
-ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin
-#ln -sf /usr/share/phpmyadmin /var/www/s-lmc.kalysto.org/phpmyadmin
+##
+## PHPMyAdmin (not finished)
+##
 
+# export DEBIAN_FRONTEND=noninteractive  ## mainly for ``phpmyadmin`` package...
+# apt-get -y install phpmyadmin
 
-pecl install tidy 
-echo "extension=tidy.so" > /etc/php5/apache2/conf.d/tidy.ini
+## Not working on ubuntu/15.10
+#ln -s /etc/phpmyadmin/apache.conf /etc/apache2/conf.d/phpmyadmin
+#ln -sf /usr/share/phpmyadmin /var/www/s-lmc.kalysto.org/phpmyadmin
+## XXX: configuration of DB access ?
 
-pecl install xdebug
-echo "extension=xdebug.so" >> /etc/php5/apache2/conf.d/xdebug.ini
 
+## XXXvlab: the following is better
+# pecl install tidy
+# echo "extension=tidy.so" > /etc/php5/apache2/conf.d/tidy.ini
+apt-get -y install php5-tidy
 
-#rdfapi-php ?
 
+## XXXvlab: the following is better
+# pecl install xdebug
+# echo "extension=xdebug.so" >> /etc/php5/apache2/conf.d/xdebug.ini
+apt-get -y install php5-xdebug
 
 
+#rdfapi-php ?
 #a2enmod dav_fs ssl userdir rewrite suexec
 a2enmod ssl rewrite
 
-/etc/init.d/apache2 restart 
+/etc/init.d/apache2 restart
 
 
+## XXXvlab: Should move the following in a relation
+
 ##
 ## Install Mail utils (for php mail command and crond script mail)
 ##
 
-MAIL_DOMAINNAME=${MAIL_DOMAINNAME:-"localdomain"}
-MAIL_SATTELITE_RELAYHOST=${MAIL_SATTELITE_RELAYHOST:-}
-
-debconf-set-selections <<< "postfix postfix/mailname string ${LXC_NAME}.${MAIL_DOMAINNAME}"
-debconf-set-selections <<< "postfix postfix/main_mailer_type select 'Local only'"
+# MAIL_DOMAINNAME=${MAIL_DOMAINNAME:-"localdomain"}
+# MAIL_SATTELITE_RELAYHOST=${MAIL_SATTELITE_RELAYHOST:-}
 
+# debconf-set-selections <<< "postfix postfix/mailname string ${LXC_NAME}.${MAIL_DOMAINNAME}"
+# debconf-set-selections <<< "postfix postfix/main_mailer_type select 'Local only'"
 
-apt-get install -y postfix mailutils
 
+# apt-get install -y postfix mailutils </dev/null
 
-postconf inet_interfaces=loopback-only
 
-[ -z "$MAIL_SATTELITE_RELAYHOST" ] && postconf relayhost="$MAIL_SATTELITE_RELAYHOST"
-postfix reload
+# postconf inet_interfaces=loopback-only
 
+# [ -z "$MAIL_SATTELITE_RELAYHOST" ] && postconf relayhost="$MAIL_SATTELITE_RELAYHOST"
+# postfix reload
diff --git a/precise/www/metadata.yaml b/precise/www/metadata.yaml
index 6c16602..5295c5b 100644
--- a/precise/www/metadata.yaml
+++ b/precise/www/metadata.yaml
@@ -2,6 +2,8 @@ name: www
 summary: "Apache"
 maintainer: "Valentin Lab <valentin.lab@kalysto.org>"
 inherit: base-0k
+compatiblity:
+  - ubuntu/15.10
 description: |
     Installs a HTTP Apache server.
 config-resources: