diff --git a/lamp-trusty64/bootstrap.sh b/lamp-trusty64/bootstrap.sh
index 03fb3b5..654407c 100644
--- a/lamp-trusty64/bootstrap.sh
+++ b/lamp-trusty64/bootstrap.sh
@@ -5,12 +5,14 @@ DIR=/vagrant
DIRDATA=$DIR/data
MYSQL_PASS=scores
MARIADB_VERSION="10.0"
-PHPMYADMIN_VERSION="4.4.7"
+PHPMYADMIN_VERSION="4.4.10"
+# --- Add a file action.upgrade to perfom a system upgrade
if [ -f $DIR/action.upgrade ]
then
sudo apt-get update
sudo apt-get -y upgrade
+ sudo rm -rf $DIR/action.upgrade
fi
# --- Installation Wkhtmltopdf
@@ -66,6 +68,7 @@ then
if [ -f /etc/php5/cli/php.ini ]
then
sudo sed -i -e 's/short_open_tag = Off/short_open_tag = On/g' /etc/php5/cli/php.ini
+ sudo sed -i -e 's/;mbstring.internal_encoding = UTF-8/mbstring.internal_encoding = UTF-8/g' /etc/php5/cli/php.ini
sudo sed -i -e 's/;date.timezone =/date.timezone = Europe\/Paris/g' /etc/php5/cli/php.ini
fi
@@ -73,6 +76,7 @@ then
if [ -f /etc/php5/apache2/php.ini ]
then
sudo sed -i -e 's/short_open_tag = Off/short_open_tag = On/g' /etc/php5/apache2/php.ini
+ sudo sed -i -e 's/;mbstring.internal_encoding = UTF-8/mbstring.internal_encoding = UTF-8/g' /etc/php5/apache2/php.ini
sudo sed -i -e 's/;date.timezone =/date.timezone = Europe\/Paris/g' /etc/php5/apache2/php.ini
sudo sed -i -e 's/post_max_size = 8M/post_max_size = 50M/g' /etc/php5/apache2/php.ini
sudo sed -i -e 's/upload_max_filesize = 2M/upload_max_filesize = 50M/g' /etc/php5/apache2/php.ini
@@ -118,7 +122,7 @@ fi
# --- Configuration Apache
if [ ! -f /etc/apache2/conf-available/httpd.conf ]
then
- sudo cp $DIRDATA/Apache/httpd.conf /etc/apache2/conf-available/
+ sudo echo "ServerName 127.0.0.1" > /etc/apache2/conf-available/httpd.conf
sudo a2enconf httpd
fi
diff --git a/lamp-trusty64/data/Apache/phpmyadmin.conf b/lamp-trusty64/data/Apache/phpmyadmin.conf
index 1b21395..5ef4e1b 100644
--- a/lamp-trusty64/data/Apache/phpmyadmin.conf
+++ b/lamp-trusty64/data/Apache/phpmyadmin.conf
@@ -2,8 +2,8 @@
ServerName phpmyadmin.sd.dev
UseCanonicalName On
UseCanonicalPhysicalPort On
- DocumentRoot /home/vhosts/phpMyAdmin-4.4.7-all-languages
-
+ DocumentRoot /home/vhosts/phpMyAdmin-4.4.10-all-languages
+
EnableSendfile Off
AllowOverride all
Require all granted
diff --git a/lamp-trusty64/data/Apps/phpMyAdmin-4.4.7-all-languages.tar.xz b/lamp-trusty64/data/Apps/phpMyAdmin-4.4.7-all-languages.tar.xz
deleted file mode 100644
index 63cd4b8..0000000
Binary files a/lamp-trusty64/data/Apps/phpMyAdmin-4.4.7-all-languages.tar.xz and /dev/null differ