Update precise64

lamp-precise64/Vagrantfile

@@ -121,5 +121,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #
   #   chef.validation_client_name = "ORGNAME-validator"
   
+  config.vm.provider "virtualbox" do |vb|
+        vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+        vb.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
+  end
+  
   config.vm.provision :shell, :path => "./bootstrap.sh"
 end

lamp-precise64/bootstrap.sh

@@ -1,26 +1,9 @@
 #!/usr/bin/env bash
 
+sudo apt-get update
+sudo apt-get upgrade
 sudo apt-get -y install htop unzip
 
-# Installation MariaDB
-if [ ! -f /etc/mysql/vagrant ]
-then
-	MARIADB_VERSION='10.0'
-	MYSQL_PASS='scores'
-	debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password password $MYSQL_PASS"
-	debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password_again password $MYSQL_PASS"
-	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 apt-get -y install mariadb-server
-	#sudo sed -i -e 's/datadir = \/var\/lib\/mysql/datadir = \/home\/vhosts\/mysql/g' /etc/mysql/my.cnf
-    sudo sed -i "s/bind-address            = 127.0.0.1/bind-address = 0.0.0.0/" /etc/mysql/my.cnf
-    sudo service mysql restart
-    mysql -hlocalhost -uroot -pscores < /vagrant/data/pma.sql
-    sudo touch /etc/mysql/vagrant
-fi
-
 # Installation Wkhtmltopdf
 if [ ! -f /usr/local/bin/wkhtmltopdf ]
 then
@@ -36,6 +19,26 @@ then
     sudo a2enmod autoindex deflate expires headers rewrite
 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'
+    sudo apt-get update
+    debconf-set-selections <<< "mariadb-server-$MARIADB_VERSION mysql-server/root_password password $MYSQL_PASS"
+    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 "s/bind-address *= 127.0.0.1/bind-address            = 0.0.0.0/" /etc/mysql/my.cnf
+    sudo sed -i "s/max_connections *= 100/max_connections         = 20/" /etc/mysql/my.cnf
+    sudo service mysql restart
+    mysql -hlocalhost -uroot -p$MYSQL_PASS < /vagrant/data/pma.sql
+    sudo touch /etc/mysql/vagrant
+fi
+
 # Installation phpMyAdmin
 PHPMYADMIN_VERSION='4.3.1'
 if [ ! -d "/home/vhosts/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages" ]
@@ -43,7 +46,7 @@ then
     if [ -f "/vagrant/data/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages.zip" ]
     then
         unzip "/vagrant/data/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages.zip" -d /home/vhosts/
-        mysql -hlocalhost -uroot -pscores < "/home/vhosts/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages/examples/create_tables.sql"
+    	mysql -hlocalhost -uroot -p$MYSQL_PASS < "/home/vhosts/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages/examples/create_tables.sql"
         cp /vagrant/data/config.inc.php "/home/vhosts/phpMyAdmin-$PHPMYADMIN_VERSION-all-languages/"
     fi
 fi
@@ -55,11 +58,22 @@ sudo sed -i -e 's/post_max_size = 8M/post_max_size = 50M/g' /etc/php5/apache2/ph
 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/xdebug.ini /etc/php5/mods-available/xdebug.ini
 
 # Browscap
 sudo cp -f /vagrant/data/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/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/phpchartdir530.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
+
 # 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
@@ -68,17 +82,17 @@ sudo sed -i -e 's/;date.timezone =/date.timezone = Europe\/Paris/g' /etc/php5/cl
 if [ ! -f /etc/apache2/conf-available/httpd.conf ]
 then
     sudo cp /vagrant/data/httpd.conf /etc/apache2/conf-available/
-    sudo mkdir /home/vhosts/apachelog
-    sudo mkdir /home/vhosts/test
+    sudo a2enconf httpd
+    
+    if [ ! -d /home/vhosts/apachelog ]
+    then
+    	sudo mkdir /home/vhosts/apachelog
+    fi
+    if [ ! -d /home/vhosts/test ]
+    then
+    	sudo mkdir /home/vhosts/test
+	fi
 fi
-if [ ! -f /vagrant/vhosts/phpmyadmin ]
-then
-    cp /vagrant/data/phpmyadmin /vagrant/vhosts/phpmyadmin
-if
-if [ ! -f /vagrant/vhosts/test ]
-then
-    cp /vagrant/data/test /vagrant/vhosts/test
-if
 
 if [ ! -f /vagrant/vhosts/phpmyadmin.conf ]
 then
@@ -103,7 +117,7 @@ for f in *; do
     then
         sudo cp -f $f /etc/apache2/sites-available/;    
         VHOSTS+=" $f"
-fi
+	fi
 done;
 sudo a2ensite $VHOSTS
 

lamp-precise64/data/ChartDirector/chartdir.ini

@@ -0,0 +1 @@
+extension=phpchartdir530.dll

lamp-precise64/data/ChartDirector/chartdir.lic

@@ -0,0 +1 @@
+DEVP-2AGF-AAFD-GAEY-BF6F-829C