diff --git a/lamp-precise64/bootstrap.sh b/lamp-precise64/bootstrap.sh index a1b988a..e979461 100644 --- a/lamp-precise64/bootstrap.sh +++ b/lamp-precise64/bootstrap.sh @@ -39,7 +39,7 @@ then fi # --- Installation phpMyAdmin -PHPMYADMIN_VERSION="4.3.7" +PHPMYADMIN_VERSION="4.4.7" PHPMYADMIN_PATH="phpMyAdmin-$PHPMYADMIN_VERSION-all-languages" if [ ! -d "/home/vhosts/$PHPMYADMIN_PATH" ] then @@ -47,7 +47,7 @@ then 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/examples/create_tables.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 diff --git a/lamp-precise64/data/Apps/phpMyAdmin-4.3.7-all-languages.tar.xz b/lamp-precise64/data/Apps/phpMyAdmin-4.3.7-all-languages.tar.xz deleted file mode 100644 index 56e430b..0000000 Binary files a/lamp-precise64/data/Apps/phpMyAdmin-4.3.7-all-languages.tar.xz and /dev/null differ 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 new file mode 100644 index 0000000..63cd4b8 Binary files /dev/null and b/lamp-precise64/data/Apps/phpMyAdmin-4.4.7-all-languages.tar.xz differ diff --git a/lamp-trusty64/bootstrap.sh b/lamp-trusty64/bootstrap.sh index 421a038..c9b9289 100644 --- a/lamp-trusty64/bootstrap.sh +++ b/lamp-trusty64/bootstrap.sh @@ -21,6 +21,39 @@ then 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 + + # --- 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 + +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 @@ -40,7 +73,7 @@ then fi # --- Installation phpMyAdmin -PHPMYADMIN_VERSION="4.3.7" +PHPMYADMIN_VERSION="4.4.7" PHPMYADMIN_PATH="phpMyAdmin-$PHPMYADMIN_VERSION-all-languages" if [ ! -d "/home/vhosts/$PHPMYADMIN_PATH" ] then @@ -48,63 +81,36 @@ then 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/examples/create_tables.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 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 /vagrant/data/PHP/xdebug.ini /etc/php5/mods-available/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/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 - -# --- 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 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 ] + 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 fi +# --- Configuration Apache / Vhosts if [ ! -f /vagrant/vhosts/phpmyadmin.conf ] then - cp /vagrant/data/Apache/phpmyadmin.conf /vagrant/vhosts/phpmyadmin.conf + cp /vagrant/data/Apache/phpmyadmin.conf /vagrant/vhosts/phpmyadmin.conf fi if [ ! -f /vagrant/vhosts/test.conf ] then cp /vagrant/data/Apache/test.conf /vagrant/vhosts/test.conf + if [ ! -d /home/vhosts/test ] + then + sudo mkdir /home/vhosts/test + fi fi # --- Disable all website diff --git a/lamp-trusty64/data/Apps/phpMyAdmin-4.3.7-all-languages.tar.xz b/lamp-trusty64/data/Apps/phpMyAdmin-4.3.7-all-languages.tar.xz deleted file mode 100644 index 56e430b..0000000 Binary files a/lamp-trusty64/data/Apps/phpMyAdmin-4.3.7-all-languages.tar.xz and /dev/null differ 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 new file mode 100644 index 0000000..63cd4b8 Binary files /dev/null and b/lamp-trusty64/data/Apps/phpMyAdmin-4.4.7-all-languages.tar.xz differ