diff --git a/lamp-precise64/bootstrap.sh b/lamp-precise64/bootstrap.sh
index e979461..811f017 100644
--- a/lamp-precise64/bootstrap.sh
+++ b/lamp-precise64/bootstrap.sh
@@ -1,122 +1,159 @@
 #!/usr/bin/env bash
 
-sudo apt-get update
-sudo apt-get -y upgrade
+VAGRANTDEV=1
+DIR=/vagrant
+DIRDATA=$DIR/data
+MYSQL_PASS=scores
+MARIADB_VERSION="10.0"
+PHPMYADMIN_VERSION="4.4.7"
 
-# Installation Wkhtmltopdf
+if [ -f $DIR/action.upgrade ]
+then
+	sudo apt-get update
+	sudo apt-get -y upgrade
+fi
+
+
+# --- Installation Wkhtmltopdf
 if [ ! -f /usr/local/bin/wkhtmltopdf ]
 then
     sudo dpkg -i /vagrant/data/Apps/wkhtmltox-0.12.1_linux-precise-amd64.deb
     sudo apt-get -f install -y
 fi
 
-# Installation
-if [ ! -f /usr/bin/php5 ]
-then
-    sudo apt-get update
-    sudo apt-get -y install htop unzip apache2 mysql-client-5.5 php5 php-apc php5-curl php5-xmlrpc php5-xsl php5-mysqlnd php5-xdebug
-    sudo a2enmod autoindex deflate expires headers rewrite
+# --- Database
+if [ $VARGANTDEV -eq 1 ] 
+then	
+	# --- Installation MariaDB
+	if [ ! -f /etc/mysql/vagrant ]
+	then    
+	    sudo apt-get install software-properties-common
+	    sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
+	    sudo add-apt-repository 'deb http://nwps.ws/pub/mariadb/repo/10.0/ubuntu precise main'
+	    sudo apt-get update
+	    sudo debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password password $MYSQL_PASS"
+	    sudo debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password_again password $MYSQL_PASS"
+	    sudo apt-get -y --allow-unauthenticated install mariadb-server
+	    #sudo sed -i -e 's/datadir = \/var\/lib\/mysql/datadir = \/home\/vhosts\/mysql/g' /etc/mysql/my.cnf
+	    sudo sed -i -e 's/bind-address[ \t]*= 127.0.0.1/bind-address = 0.0.0.0/g' /etc/mysql/my.cnf
+	    sudo sed -i -e 's/max_connections[ \t]*= 100/max_connections = 20/g' /etc/mysql/my.cnf       
+	    sudo touch /etc/mysql/vagrant
+	fi
+else
+	# --- Installation MySQL Server
+	if [ ! -f /etc/mysql/vagrant ]
+	then 
+		sudo debconf-set-selections <<< "mysql-server mysql-server/root_password password $MYSQL_PASS"
+	    sudo debconf-set-selections <<< "mysql-server mysql-server/root_password_again password $MYSQL_PASS"
+	    sudo apt-get -y install mysql-server
+		sudo sed -i -e 's/bind-address[ \t]*= 127.0.0.1/bind-address = 0.0.0.0/g' /etc/mysql/my.cnf
+		sudo sed -i -e 's/max_connections[ \t]*= 100/max_connections = 20/g' /etc/mysql/my.cnf       
+		sudo touch /etc/mysql/vagrant
+	fi
 fi
 
-# Installation MariaDB
-MARIADB_VERSION="10.0"
-MYSQL_PASS=scores
-if [ ! -f /etc/mysql/vagrant ]
-then    
-    sudo apt-get install software-properties-common
-    sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
-    sudo add-apt-repository 'deb http://nwps.ws/pub/mariadb/repo/10.0/ubuntu precise main'
+# --- PHP
+if [ ! -f /usr/bin/php5 ]
+then
+
     sudo apt-get update
-    sudo debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password password $MYSQL_PASS"
-    sudo debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password_again password $MYSQL_PASS"
-    sudo apt-get -y --allow-unauthenticated install mariadb-server
-    #sudo sed -i -e 's/datadir = \/var\/lib\/mysql/datadir = \/home\/vhosts\/mysql/g' /etc/mysql/my.cnf
-    sudo sed -i -e 's/bind-address[ \t]*= 127.0.0.1/bind-address = 0.0.0.0/g' /etc/mysql/my.cnf
-    sudo sed -i -e 's/max_connections[ \t]*= 100/max_connections = 20/g' /etc/mysql/my.cnf
-    sudo service mysql restart
-    mysql -hlocalhost -uroot -p$MYSQL_PASS < /vagrant/data/Apps/phpmyadmin.sql
-    sudo touch /etc/mysql/vagrant
+    sudo apt-get -y install htop unzip apache2 mysql-client-5.5 php5 php5-apcu php5-curl php5-xmlrpc php5-xsl php5-mysqlnd    
+    if [ $VARGANTDEV -eq 1 ] 
+    then
+    	sudo apt-get -y install php5-xdebug
+    fi
+    
+    # --- Configuration PHP / CLI
+	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/;date.timezone =/date.timezone = Europe\/Paris/g' /etc/php5/cli/php.ini
+	fi 
+	
+	# --- Configuration PHP / APACHE2
+    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/;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
+		sudo sed -i -e 's/session.gc_maxlifetime = 1440/session.gc_maxlifetime = 86400/g' /etc/php5/apache2/php.ini
+		sudo sed -i -e 's/;opcache.enable=0/opcache.enable=1/g' /etc/php5/apache2/php.ini
+		sudo cp $DIRDATA/PHP/xdebug.ini /etc/php5/mods-available/xdebug.ini
+		
+		# --- Browscap
+		sudo cp -f $DIRDATA/PHP/php_browscap.ini /etc/php5/apache2/
+		sudo sed -i -e 's/;browscap = extra\/browscap.ini/browscap = \/etc\/php5\/apache2\/php_browscap.ini/g' /etc/php5/apache2/php.ini
+	fi
+	
+	# --- ChartDirector
+	if [ ! -f /usr/lib/php5/20090626/chartdir.lic ] 
+	then
+	    sudo cp -R $DIRDATA/ChartDirector/lib/fonts /usr/lib/php5/20090626/
+	    sudo cp $DIRDATA/ChartDirector/lib/libchartdir.so /usr/lib/php5/20090626/
+	    sudo cp $DIRDATA/ChartDirector/lib/phpchartdir550.dll /usr/lib/php5/20090626/
+	    sudo cp $DIRDATA/ChartDirector/chartdir.lic /usr/lib/php5/20090626/
+	    sudo cp $DIRDATA/ChartDirector/chartdir.ini /etc/php5/mods-available/
+	    sudo php5enmod chartdir
+	fi
+	
+	sudo a2enmod autoindex deflate expires headers rewrite
+
 fi
 
 # --- Installation phpMyAdmin
-PHPMYADMIN_VERSION="4.4.7"
 PHPMYADMIN_PATH="phpMyAdmin-$PHPMYADMIN_VERSION-all-languages"
 if [ ! -d "/home/vhosts/$PHPMYADMIN_PATH" ]
 then
-    if [ -f "/vagrant/data/Apps/$PHPMYADMIN_PATH.tar.xz" ]
+    if [ -f "$DIRDATA/Apps/$PHPMYADMIN_PATH.tar.xz" ]
     then
-        tar xJvf "/vagrant/data/Apps/$PHPMYADMIN_PATH.tar.xz" --directory /home/vhosts/
-        mysql -hlocalhost -uroot -p$MYSQL_PASS < /vagrant/data/Apps/phpmyadmin.sql
-        mysql -hlocalhost -uroot -p$MYSQL_PASS < /home/vhosts/$PHPMYADMIN_PATH/sql/create_tables.sql
-        sudo service mysql restart 
-        cp /vagrant/data/Apps/config.inc.php /home/vhosts/$PHPMYADMIN_PATH/
-        chmod 0444 /home/vhosts/$PHPMYADMIN_PATH/config.inc.php
+    	tar xJvf "$DIRDATA/Apps/$PHPMYADMIN_PATH.tar.xz" --directory /home/vhosts/
+    	mysql -hlocalhost -uroot -p$MYSQL_PASS < $DIRDATA/Apps/phpmyadmin.sql
+    	mysql -hlocalhost -uroot -p$MYSQL_PASS < /home/vhosts/$PHPMYADMIN_PATH/sql/create_tables.sql
+    	sudo service mysql restart 
+    	cp $DIRDATA/Apps/config.inc.php /home/vhosts/$PHPMYADMIN_PATH/
+    	chmod 0444 /home/vhosts/$PHPMYADMIN_PATH/config.inc.php
+	fi
+fi
+
+
+# --- Configuration Apache
+if [ ! -f /etc/apache2/httpd.conf ]
+then
+    sudo cp $DIRDATA/Apache/httpd.conf /etc/apache2/
+fi
+
+# --- Configuration Apache / Vhosts
+if [ ! -f $DIR/vhosts/phpmyadmin ]
+then
+    cp $DIRDATA/Apache/phpmyadmin $DIR/vhosts/phpmyadmin
+fi
+if [ ! -f $DIR/vhosts/test ]
+then
+    cp $DIRDATA/Apache/test /etc/apache2/sites-available/test
+	if [ ! -d /home/vhosts/test ]
+    then
+        sudo mkdir /home/vhosts/test
     fi
 fi
 
-# Configuration PHP / Apache
-sudo sed -i -e 's/short_open_tag = Off/short_open_tag = On/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
-sudo sed -i -e 's/session.gc_maxlifetime = 1440/session.gc_maxlifetime = 86400/g' /etc/php5/apache2/php.ini
-sudo sed -i -e 's/;opcache.enable=0/opcache.enable=1/g' /etc/php5/apache2/php.ini
-sudo cp -f /vagrant/data/PHP/xdebug.ini /etc/php5/conf.d/xdebug.ini
-
-# Browscap
-sudo cp -f /vagrant/data/PHP/php_browscap.ini /etc/php5/apache2/
-sudo sed -i -e 's/;browscap = extra\/browscap.ini/browscap = \/etc\/php5\/apache2\/php_browscap.ini/g' /etc/php5/apache2/php.ini
-
-if [ ! -f /usr/lib/php5/20090626/chartdir.lic ] 
-then
-    sudo cp -R /vagrant/data/ChartDirector/lib/fonts /usr/lib/php5/20090626/
-    sudo cp /vagrant/data/ChartDirector/lib/libchartdir.so /usr/lib/php5/20090626/
-    sudo cp /vagrant/data/ChartDirector/lib/phpchartdir530.dll /usr/lib/php5/20090626/
-    sudo cp /vagrant/data/ChartDirector/chartdir.lic /usr/lib/php5/20090626/
-    sudo cp /vagrant/data/ChartDirector/chartdir.ini /etc/php5/conf.d/
-fi
-
-# Configuration PHP / CLI
-sudo sed -i -e 's/short_open_tag = Off/short_open_tag = On/g' /etc/php5/cli/php.ini
-sudo sed -i -e 's/;date.timezone =/date.timezone = Europe\/Paris/g' /etc/php5/cli/php.ini
-
-# Configuration Apache
-sudo cp -f /vagrant/data/Apache/httpd.conf /etc/apache2/
-if [ ! -d /home/vhosts/apachelog ]
-then
-	sudo mkdir /home/vhosts/apachelog
-fi
-if [ ! -d /home/vhosts/test ]
-then
-	sudo mkdir /home/vhosts/test
-fi
-
-if [ ! -f /vagrant/vhosts/phpmyadmin ]
-then
-    cp /vagrant/data/Apache/phpmyadmin /vagrant/vhosts/phpmyadmin
-fi
-if [ ! -f /vagrant/vhosts/test ]
-then
-    cp /vagrant/data/Apache/test /vagrant/vhosts/test
-fi
-
-# Disable all website
+# --- Disable all website
 cd /etc/apache2/sites-available/
 DVHOSTS=''
 for f in *; do DVHOSTS+=" $f"; done;
 sudo a2dissite $DVHOSTS
 
-# Copy Vhosts files
+# --- Copy Vhosts files
 VHOSTS='default'
-cd /vagrant/vhosts/
+cd $DIR/vhosts/
 for f in *; do 
     if [ -f $f ]
     then
-        sudo cp -f $f /etc/apache2/sites-available/    
+        sudo cp -f $f /etc/apache2/sites-available/;    
         VHOSTS+=" $f"
 	fi
 done;
 sudo a2ensite $VHOSTS
 
-# Restart apache
+# --- Restart apache
 sudo service apache2 restart
diff --git a/lamp-precise64/vhosts/README b/lamp-precise64/vhosts/README
deleted file mode 100644
index b61805c..0000000
--- a/lamp-precise64/vhosts/README
+++ /dev/null
@@ -1,3 +0,0 @@
-
-Place you vhost files here 
-and execute vagrant provision to configure automatically apache.
diff --git a/lamp-trusty64/bootstrap.sh b/lamp-trusty64/bootstrap.sh
index a6c0e07..288dbc1 100644
--- a/lamp-trusty64/bootstrap.sh
+++ b/lamp-trusty64/bootstrap.sh
@@ -1,6 +1,13 @@
 #!/usr/bin/env bash
 
-if [ -f /vagrant/action.upgrade ]
+VAGRANTDEV=1
+DIR=/vagrant
+DIRDATA=$DIR/data
+MYSQL_PASS=scores
+MARIADB_VERSION="10.0"
+PHPMYADMIN_VERSION="4.4.7"
+
+if [ -f $DIR/action.upgrade ]
 then
 	sudo apt-get update
 	sudo apt-get -y upgrade
@@ -9,81 +16,101 @@ fi
 # --- Installation Wkhtmltopdf
 if [ ! -f /usr/local/bin/wkhtmltopdf ]
 then
-    sudo dpkg -i /vagrant/data/Apps/wkhtmltox-0.12.2.1_linux-trusty-amd64.deb
+    sudo dpkg -i $DIRDATA/Apps/wkhtmltox-0.12.2.1_linux-trusty-amd64.deb
     sudo apt-get -f install -y
 fi
 
-# --- Installation
+# --- Database
+if [ $VARGANTDEV -eq 1 ] 
+then	
+	# --- Installation MariaDB
+	if [ ! -f /etc/mysql/vagrant ]
+	then    
+	    sudo apt-get install software-properties-common
+	    sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
+	    sudo add-apt-repository 'deb http://nwps.ws/pub/mariadb/repo/10.0/ubuntu trusty main'
+	    sudo apt-get update
+	    sudo debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password password $MYSQL_PASS"
+	    sudo debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password_again password $MYSQL_PASS"
+	    sudo apt-get -y --allow-unauthenticated install mariadb-server
+	    #sudo sed -i -e 's/datadir = \/var\/lib\/mysql/datadir = \/home\/vhosts\/mysql/g' /etc/mysql/my.cnf
+	    sudo sed -i -e 's/bind-address[ \t]*= 127.0.0.1/bind-address = 0.0.0.0/g' /etc/mysql/my.cnf
+	    sudo sed -i -e 's/max_connections[ \t]*= 100/max_connections = 20/g' /etc/mysql/my.cnf       
+	    sudo touch /etc/mysql/vagrant
+	fi
+else
+	# --- Installation MySQL Server
+	if [ ! -f /etc/mysql/vagrant ]
+	then 
+		sudo debconf-set-selections <<< "mysql-server mysql-server/root_password password $MYSQL_PASS"
+	    sudo debconf-set-selections <<< "mysql-server mysql-server/root_password_again password $MYSQL_PASS"
+	    sudo apt-get -y install mysql-server
+		sudo sed -i -e 's/bind-address[ \t]*= 127.0.0.1/bind-address = 0.0.0.0/g' /etc/mysql/my.cnf
+		sudo sed -i -e 's/max_connections[ \t]*= 100/max_connections = 20/g' /etc/mysql/my.cnf       
+		sudo touch /etc/mysql/vagrant
+	fi
+fi
+
+# --- PHP
 if [ ! -f /usr/bin/php5 ]
 then
+
     sudo apt-get update
-    sudo apt-get -y install htop unzip apache2 mysql-client-5.5 php5 php5-apcu php5-curl php5-xmlrpc php5-xsl php5-mysqlnd php5-xdebug
-    sudo a2enmod autoindex deflate expires headers rewrite
-fi
-
-# --- Configuration PHP / CLI
-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/;date.timezone =/date.timezone = Europe\/Paris/g' /etc/php5/cli/php.ini
-fi 
-
-# --- Configuration PHP - Apache2
-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/;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
-	sudo sed -i -e 's/session.gc_maxlifetime = 1440/session.gc_maxlifetime = 86400/g' /etc/php5/apache2/php.ini
-	sudo sed -i -e 's/;opcache.enable=0/opcache.enable=1/g' /etc/php5/apache2/php.ini
-	sudo cp /vagrant/data/PHP/xdebug.ini /etc/php5/mods-available/xdebug.ini
+    sudo apt-get -y install htop unzip apache2 mysql-client-5.5 php5 php5-apcu php5-curl php5-xmlrpc php5-xsl php5-mysqlnd    
+    if [ $VARGANTDEV -eq 1 ] 
+    then
+    	sudo apt-get -y install php5-xdebug
+    fi
+    
+    # --- Configuration PHP / CLI
+	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/;date.timezone =/date.timezone = Europe\/Paris/g' /etc/php5/cli/php.ini
+	fi 
 	
-	# --- Browscap
-	sudo cp -f /vagrant/data/PHP/php_browscap.ini /etc/php5/apache2/
-	sudo sed -i -e 's/;browscap = extra\/browscap.ini/browscap = \/etc\/php5\/apache2\/php_browscap.ini/g' /etc/php5/apache2/php.ini
-fi
+	# --- Configuration PHP / APACHE2
+    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/;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
+		sudo sed -i -e 's/session.gc_maxlifetime = 1440/session.gc_maxlifetime = 86400/g' /etc/php5/apache2/php.ini
+		sudo sed -i -e 's/;opcache.enable=0/opcache.enable=1/g' /etc/php5/apache2/php.ini
+		sudo cp $DIRDATA/PHP/xdebug.ini /etc/php5/mods-available/xdebug.ini
+		
+		# --- Browscap
+		sudo cp -f $DIRDATA/PHP/php_browscap.ini /etc/php5/apache2/
+		sudo sed -i -e 's/;browscap = extra\/browscap.ini/browscap = \/etc\/php5\/apache2\/php_browscap.ini/g' /etc/php5/apache2/php.ini
+	fi
+	
+	# --- ChartDirector
+	if [ ! -f /usr/lib/php5/20121212/chartdir.lic ] 
+	then
+	    sudo cp -R $DIRDATA/ChartDirector/lib/fonts /usr/lib/php5/20121212/
+	    sudo cp $DIRDATA/ChartDirector/lib/libchartdir.so /usr/lib/php5/20121212/
+	    sudo cp $DIRDATA/ChartDirector/lib/phpchartdir550.dll /usr/lib/php5/20121212/
+	    sudo cp $DIRDATA/ChartDirector/chartdir.lic /usr/lib/php5/20121212/
+	    sudo cp $DIRDATA/ChartDirector/chartdir.ini /etc/php5/mods-available/
+	    sudo php5enmod chartdir
+	fi
+	
+	sudo a2enmod autoindex deflate expires headers rewrite
 
-if [ ! -f /usr/lib/php5/20121212/chartdir.lic ] 
-then
-    sudo cp -R /vagrant/data/ChartDirector/lib/fonts /usr/lib/php5/20121212/
-    sudo cp /vagrant/data/ChartDirector/lib/libchartdir.so /usr/lib/php5/20121212/
-    sudo cp /vagrant/data/ChartDirector/lib/phpchartdir550.dll /usr/lib/php5/20121212/
-    sudo cp /vagrant/data/ChartDirector/chartdir.lic /usr/lib/php5/20121212/
-    sudo cp /vagrant/data/ChartDirector/chartdir.ini /etc/php5/mods-available/
-    sudo php5enmod chartdir
-fi
-
-# --- Installation MariaDB
-MARIADB_VERSION="10.0"
-MYSQL_PASS=scores
-if [ ! -f /etc/mysql/vagrant ]
-then    
-    sudo apt-get install software-properties-common
-    sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db
-    sudo add-apt-repository 'deb http://nwps.ws/pub/mariadb/repo/10.0/ubuntu trusty main'
-    sudo apt-get update
-    sudo debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password password $MYSQL_PASS"
-    sudo debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password_again password $MYSQL_PASS"
-    sudo apt-get -y --allow-unauthenticated install mariadb-server
-    #sudo sed -i -e 's/datadir = \/var\/lib\/mysql/datadir = \/home\/vhosts\/mysql/g' /etc/mysql/my.cnf
-    sudo sed -i -e 's/bind-address[ \t]*= 127.0.0.1/bind-address = 0.0.0.0/g' /etc/mysql/my.cnf
-    sudo sed -i -e 's/max_connections[ \t]*= 100/max_connections = 20/g' /etc/mysql/my.cnf       
-    sudo touch /etc/mysql/vagrant
 fi
 
 # --- Installation phpMyAdmin
-PHPMYADMIN_VERSION="4.4.7"
 PHPMYADMIN_PATH="phpMyAdmin-$PHPMYADMIN_VERSION-all-languages"
 if [ ! -d "/home/vhosts/$PHPMYADMIN_PATH" ]
 then
-    if [ -f "/vagrant/data/Apps/$PHPMYADMIN_PATH.tar.xz" ]
+    if [ -f "$DIRDATA/Apps/$PHPMYADMIN_PATH.tar.xz" ]
     then
-    	tar xJvf "/vagrant/data/Apps/$PHPMYADMIN_PATH.tar.xz" --directory /home/vhosts/
-    	mysql -hlocalhost -uroot -p$MYSQL_PASS < /vagrant/data/Apps/phpmyadmin.sql
+    	tar xJvf "$DIRDATA/Apps/$PHPMYADMIN_PATH.tar.xz" --directory /home/vhosts/
+    	mysql -hlocalhost -uroot -p$MYSQL_PASS < $DIRDATA/Apps/phpmyadmin.sql
     	mysql -hlocalhost -uroot -p$MYSQL_PASS < /home/vhosts/$PHPMYADMIN_PATH/sql/create_tables.sql
     	sudo service mysql restart 
-    	cp /vagrant/data/Apps/config.inc.php /home/vhosts/$PHPMYADMIN_PATH/
+    	cp $DIRDATA/Apps/config.inc.php /home/vhosts/$PHPMYADMIN_PATH/
     	chmod 0444 /home/vhosts/$PHPMYADMIN_PATH/config.inc.php
 	fi
 fi
@@ -91,22 +118,18 @@ fi
 # --- Configuration Apache
 if [ ! -f /etc/apache2/conf-available/httpd.conf ]
 then
-    sudo cp /vagrant/data/Apache/httpd.conf /etc/apache2/conf-available/
-    sudo a2enconf httpd 
-	if [ ! -d /home/vhosts/apachelog ]
-    then
-        sudo mkdir /home/vhosts/apachelog
-    fi	
+    sudo cp $DIRDATA/Apache/httpd.conf /etc/apache2/conf-available/
+    sudo a2enconf httpd 	
 fi
 
 # --- Configuration Apache / Vhosts
-if [ ! -f /vagrant/vhosts/phpmyadmin.conf ]
+if [ ! -f $DIR/vhosts/phpmyadmin.conf ]
 then
-    cp /vagrant/data/Apache/phpmyadmin.conf /vagrant/vhosts/phpmyadmin.conf	
+    cp $DIRDATA/Apache/phpmyadmin.conf $DIR/vhosts/phpmyadmin.conf	
 fi
-if [ ! -f /vagrant/vhosts/test.conf ]
+if [ ! -f $DIR/vhosts/test.conf ]
 then
-    cp /vagrant/data/Apache/test.conf /vagrant/vhosts/test.conf
+    cp $DIRDATA/Apache/test.conf /etc/apache2/sites-available/test.conf
 	if [ ! -d /home/vhosts/test ]
     then
         sudo mkdir /home/vhosts/test
@@ -121,7 +144,7 @@ sudo a2dissite $DVHOSTS
 
 # --- Copy Vhosts files
 VHOSTS='000-default.conf'
-cd /vagrant/vhosts/
+cd $DIR/vhosts/
 for f in *.conf; do 
     if [ -f $f ]
     then
diff --git a/lamp-trusty64/data/Apps/wkhtmltox-0.12.1_linux-trusty-amd64.deb b/lamp-trusty64/data/Apps/wkhtmltox-0.12.2.1_linux-trusty-amd64.deb
similarity index 62%
rename from lamp-trusty64/data/Apps/wkhtmltox-0.12.1_linux-trusty-amd64.deb
rename to lamp-trusty64/data/Apps/wkhtmltox-0.12.2.1_linux-trusty-amd64.deb
index 5306b21..0f4a234 100644
Binary files a/lamp-trusty64/data/Apps/wkhtmltox-0.12.1_linux-trusty-amd64.deb and b/lamp-trusty64/data/Apps/wkhtmltox-0.12.2.1_linux-trusty-amd64.deb differ