diff --git a/lamp-precise64/bootstrap.sh b/lamp-precise64/bootstrap.sh
index b3f3828..2ae778d 100644
--- a/lamp-precise64/bootstrap.sh
+++ b/lamp-precise64/bootstrap.sh
@@ -5,7 +5,7 @@ DIR=/vagrant
DIRDATA=$DIR/data
MYSQL_PASS=scores
MARIADB_VERSION="10.0"
-PHPMYADMIN_VERSION="4.4.7"
+PHPMYADMIN_VERSION="4.4.14"
if [ -f $DIR/action.upgrade ]
then
diff --git a/lamp-precise64/data/Apache/phpmyadmin b/lamp-precise64/data/Apache/phpmyadmin
index df8dff8..2d06a1e 100644
--- a/lamp-precise64/data/Apache/phpmyadmin
+++ b/lamp-precise64/data/Apache/phpmyadmin
@@ -2,8 +2,8 @@
ServerName phpmyadmin.sd.dev
UseCanonicalName On
UseCanonicalPhysicalPort On
- DocumentRoot /home/vhosts/phpMyAdmin-4.3.7-all-languages
-
+ DocumentRoot /home/vhosts/phpMyAdmin-4.4.10-all-languages
+
EnableSendfile Off
AllowOverride all
Order allow,deny
diff --git a/lamp-precise64/data/Apps/phpMyAdmin-4.4.7-all-languages.tar.xz b/lamp-precise64/data/Apps/phpMyAdmin-4.4.7-all-languages.tar.xz
deleted file mode 100644
index 63cd4b8..0000000
Binary files a/lamp-precise64/data/Apps/phpMyAdmin-4.4.7-all-languages.tar.xz and /dev/null differ
diff --git a/lamp-trusty64/bootstrap.sh b/lamp-trusty64/bootstrap.sh
index 8e7d82f..9b3135a 100644
--- a/lamp-trusty64/bootstrap.sh
+++ b/lamp-trusty64/bootstrap.sh
@@ -1,11 +1,11 @@
#!/usr/bin/env bash
-VAGRANTDEV=1
+VARGANTDEV=1
DIR=/vagrant
DIRDATA=$DIR/data
MYSQL_PASS=scores
MARIADB_VERSION="10.0"
-PHPMYADMIN_VERSION="4.4.10"
+PHPMYADMIN_VERSION="4.5.1"
# --- Add a file action.upgrade to perfom a system upgrade
if [ -f $DIR/action.upgrade ]
@@ -128,9 +128,24 @@ fi
# --- Disable all website
cd /etc/apache2/sites-available/
-DVHOSTS=''
-for f in *.conf; do DVHOSTS+=" $f"; done;
-sudo a2dissite $DVHOSTS
+for f in *.conf; do
+ if [ $f = "000-default.conf" ]; then
+ continue
+ fi
+ if [ $f = "default-ssl.conf" ]; then
+ continue
+ fi
+ sudo a2dissite $f;
+ sudo rm -vf /etc/apache2/sites-available/$f;
+done;
+
+# --- phpmyadmin.sd.dev && test.sd.dev
+cp -f $DIRDATA/Apache/phpmyadmin.conf $DIR/vhosts/phpmyadmin.conf
+cp -f $DIRDATA/Apache/test.conf /etc/apache2/sites-available/test.conf
+if [ ! -d /home/vhosts/test ]
+then
+ sudo mkdir /home/vhosts/test
+fi
# --- Copy Vhosts files
VHOSTS='000-default.conf'
@@ -142,7 +157,6 @@ for f in *.conf; do
if [ $f = "default-ssl.conf" ]; then
continue
fi
- sudo rm -vf /etc/apache2/sites-available/$f;
if [ -f $f ]
then
sudo cp -vf $f /etc/apache2/sites-available/;
@@ -150,20 +164,6 @@ for f in *.conf; do
fi
done;
-# --- PhpMyAdmin / test.sd.lan
-if [ ! -f $DIR/vhosts/phpmyadmin.conf ]
-then
- cp $DIRDATA/Apache/phpmyadmin.conf $DIR/vhosts/phpmyadmin.conf
-fi
-if [ ! -f $DIR/vhosts/test.conf ]
-then
- cp $DIRDATA/Apache/test.conf /etc/apache2/sites-available/test.conf
- if [ ! -d /home/vhosts/test ]
- then
- sudo mkdir /home/vhosts/test
- fi
-fi
-
sudo a2ensite $VHOSTS
# --- Restart apache
diff --git a/lamp-trusty64/data/Apache/phpmyadmin.conf b/lamp-trusty64/data/Apache/phpmyadmin.conf
index 5ef4e1b..d80fcda 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.10-all-languages
-
+ DocumentRoot /home/vhosts/phpMyAdmin-4.5.1-all-languages
+
EnableSendfile Off
AllowOverride all
Require all granted
diff --git a/lamp-trusty64/data/Apps/phpMyAdmin-4.4.10-all-languages.tar.xz b/lamp-trusty64/data/Apps/phpMyAdmin-4.4.10-all-languages.tar.xz
deleted file mode 100644
index 3a76282..0000000
Binary files a/lamp-trusty64/data/Apps/phpMyAdmin-4.4.10-all-languages.tar.xz and /dev/null differ
diff --git a/lamp-trusty64/data/Apps/phpMyAdmin-4.5.1-all-languages.tar.xz b/lamp-trusty64/data/Apps/phpMyAdmin-4.5.1-all-languages.tar.xz
new file mode 100644
index 0000000..7c0b9ed
Binary files /dev/null and b/lamp-trusty64/data/Apps/phpMyAdmin-4.5.1-all-languages.tar.xz differ