diff --git a/lamp-trusty64-fpm/bootstrap.sh b/lamp-trusty64-fpm/bootstrap.sh index f9c72b4..cbfc404 100644 --- a/lamp-trusty64-fpm/bootstrap.sh +++ b/lamp-trusty64-fpm/bootstrap.sh @@ -187,4 +187,3 @@ sudo a2ensite $VHOSTS # --- Restart apache sudo service apache2 restart - diff --git a/lamp-xenial64-fpm/bootstrap.sh b/lamp-xenial64-fpm/bootstrap.sh index 782a027..b67ef2e 100644 --- a/lamp-xenial64-fpm/bootstrap.sh +++ b/lamp-xenial64-fpm/bootstrap.sh @@ -5,7 +5,7 @@ DIR=/vagrant DIRDATA=$DIR/data MYSQL_PASS=scores MARIADB_VERSION="10.1" -PHPMYADMIN_VERSION="4.6.1" +PHPMYADMIN_VERSION="4.6.3" # --- Add a file action.upgrade to perfom a system upgrade if [ -f $DIR/action.upgrade ] @@ -18,9 +18,10 @@ fi # --- Installation Wkhtmltopdf if [ ! -f /usr/local/bin/wkhtmltopdf ] then - - sudo dpkg -i $DIRDATA/Apps/wkhtmltox-0.12.2.1_linux-trusty-amd64.deb - sudo apt-get -f install -y + wget -q http://download.gna.org/wkhtmltopdf/0.12/0.12.3/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz + tar xJf wkhtmltox-0.12.3_linux-generic-amd64.tar.xz + cp -R wkhtmltox/* /usr/local/ + rm -rf wkhtmltox* fi # --- Database @@ -30,10 +31,8 @@ then 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 0xF1656F24C74CD1D8 - sudo add-apt-repository 'deb [arch=amd64,i386] http://ftp.igh.cnrs.fr/pub/mariadb/repo/10.1/ubuntu xenial main' - + sudo add-apt-repository 'deb [arch=amd64,i386] http://ftp.igh.cnrs.fr/pub/mariadb/repo/10.1/ubuntu xenial 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" @@ -60,15 +59,16 @@ fi # --- PHP if [ ! -f /usr/bin/php5 ] then - + # Install sudo apt-get update - sudo apt-get -y install htop unzip apache2 libapache2-mod-fastcgi php5-fpm php5-cli php5-apcu php5-curl php5-xmlrpc php5-xsl php5-mysqlnd + sudo apt-get -y install htop unzip apache2 php5-fpm php5-cli php5-apcu php5-curl php5-xmlrpc php5-xsl php5-mysqlnd if [ $VARGANTDEV -eq 1 ] then sudo apt-get -y install php5-xdebug fi - sudo a2enmod autoindex deflate expires headers rewrite actions - sudo cp -f $DIRDATA/Apache/fastcgi.conf /etc/apache2/mods-available/fastcgi.conf + sudo a2enmod autoindex deflate expires headers rewrite actions proxy proxy_fcgi + sudo cp -f $DIRDATA/Apache/phpfcgi.conf /etc/apache2/conf-available/phpfcgi.conf + sudo a2enconf phpfcgi # --- Configuration PHP / CLI if [ -f /etc/php5/cli/php.ini ] @@ -128,7 +128,7 @@ then mysql -hlocalhost -uroot -p$MYSQL_PASS < $DIRDATA/Apps/phpmyadmin.sql sudo service mysql restart cp $DIRDATA/Apps/config.inc.php /home/vhosts/$PHPMYADMIN_DIR/ - chmod 0444 /home/vhosts/$PHPMYADMIN_DIR/config.inc.php + chmod 0644 /home/vhosts/$PHPMYADMIN_DIR/config.inc.php fi fi @@ -184,4 +184,3 @@ sudo a2ensite $VHOSTS # --- Restart apache sudo service apache2 restart - diff --git a/lamp-xenial64-fpm/data/Apache/fastcgi.conf b/lamp-xenial64-fpm/data/Apache/fastcgi.conf deleted file mode 100644 index cc5c4a6..0000000 --- a/lamp-xenial64-fpm/data/Apache/fastcgi.conf +++ /dev/null @@ -1,9 +0,0 @@ - - AddType application/x-httpd-fastphp5 .php - Action application/x-httpd-fastphp5 /php5-fcgi - Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -socket /var/run/php5-fpm.sock -pass-header Authorization -idle-timeout 310 - - Require all granted - - \ No newline at end of file diff --git a/lamp-xenial64-fpm/data/Apache/phpfcgi.conf b/lamp-xenial64-fpm/data/Apache/phpfcgi.conf new file mode 100644 index 0000000..2c4b4df --- /dev/null +++ b/lamp-xenial64-fpm/data/Apache/phpfcgi.conf @@ -0,0 +1,18 @@ + + # Pick one of the following approaches + # Use the standard TCP socket + # SetHandler "proxy:fcgi://localhost/:9000" + # If your version of httpd is 2.4.9 or newer (or has the back-ported feature), you can use the unix domain socket + # SetHandler "proxy:unix:/path/to/app.sock|fcgi://localhost/" + SetHandler "proxy:unix:/var/run/php7.0-fpm.sock|fcgi://localhost/" + + +# Définition d'une configuration de mandataire qui convient. +# La partie qui est mise en correspondance avec la valeur de SetHandler est la partie qui suit +# le "pipe". Si vous devez faire une distinction, "localhost" peut être changé en un nom de +# serveur unique. +# +# + +# Add Authorization Header +SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 \ No newline at end of file diff --git a/lamp-xenial64-fpm/data/Apps/config.inc.php b/lamp-xenial64-fpm/data/Apps/config.inc.php index 6335694..29152fb 100644 --- a/lamp-xenial64-fpm/data/Apps/config.inc.php +++ b/lamp-xenial64-fpm/data/Apps/config.inc.php @@ -50,6 +50,6 @@ $cfg['ServerDefault'] = 1; $cfg['blowfish_secret'] = '4e38214cb34af7.78090185'; $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; -$cfg['LoginCookieValidity'] = 3600 * 9; +$cfg['LoginCookieValidity'] = 86400; ?> \ No newline at end of file diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvB.pfc b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvB.pfc deleted file mode 100644 index 2b76afa..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvB.pfc and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvB08.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvB08.pcf deleted file mode 100644 index 40e8156..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvB08.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvBI.pfc b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvBI.pfc deleted file mode 100644 index ffb77de..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvBI.pfc and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvBI08.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvBI08.pcf deleted file mode 100644 index b7bbbe9..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvBI08.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI.pfc b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI.pfc deleted file mode 100644 index 666710f..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI.pfc and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI08.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI08.pcf deleted file mode 100644 index 3cf7829..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI08.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI10.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI10.pcf deleted file mode 100644 index 6ccb1a6..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI10.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI12.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI12.pcf deleted file mode 100644 index 92cde00..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI12.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI14.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI14.pcf deleted file mode 100644 index 8df233e..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvI14.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR.pfc b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR.pfc deleted file mode 100644 index 76fd57f..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR.pfc and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR08.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR08.pcf deleted file mode 100644 index 611e57d..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR08.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR10.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR10.pcf deleted file mode 100644 index a245fae..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR10.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR12.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR12.pcf deleted file mode 100644 index 4579ae7..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR12.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR14.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR14.pcf deleted file mode 100644 index e57d71a..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/helvR14.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/script.pfc b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/script.pfc deleted file mode 100644 index a190d94..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/script.pfc and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timB.pfc b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timB.pfc deleted file mode 100644 index ae7667f..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timB.pfc and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timB08.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timB08.pcf deleted file mode 100644 index ebd9b3c..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timB08.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timBI.pfc b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timBI.pfc deleted file mode 100644 index d33c105..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timBI.pfc and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timBI08.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timBI08.pcf deleted file mode 100644 index b5cac49..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timBI08.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI.pfc b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI.pfc deleted file mode 100644 index c8304fe..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI.pfc and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI08.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI08.pcf deleted file mode 100644 index 9247cd4..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI08.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI10.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI10.pcf deleted file mode 100644 index 70cb962..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI10.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI12.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI12.pcf deleted file mode 100644 index ded7b9f..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI12.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI14.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI14.pcf deleted file mode 100644 index ce42cde..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timI14.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR.pfc b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR.pfc deleted file mode 100644 index 646f2ea..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR.pfc and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR08.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR08.pcf deleted file mode 100644 index d86708f..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR08.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR10.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR10.pcf deleted file mode 100644 index 510811a..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR10.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR12.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR12.pcf deleted file mode 100644 index 7f0b76c..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR12.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR14.pcf b/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR14.pcf deleted file mode 100644 index 285b264..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/fonts/timR14.pcf and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/libchartdir.so b/lamp-xenial64-fpm/data/ChartDirector/lib/libchartdir.so deleted file mode 100644 index 1683eeb..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/libchartdir.so and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir530.dll b/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir530.dll deleted file mode 100644 index 7790561..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir530.dll and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir530mt.dll b/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir530mt.dll deleted file mode 100644 index d141842..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir530mt.dll and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir550.dll b/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir550.dll deleted file mode 100644 index b793096..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir550.dll and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir550mt.dll b/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir550mt.dll deleted file mode 100644 index c8069e7..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir550mt.dll and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir560.dll b/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir560.dll deleted file mode 100644 index a05f53e..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir560.dll and /dev/null differ diff --git a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir560mt.dll b/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir560mt.dll deleted file mode 100644 index e330410..0000000 Binary files a/lamp-xenial64-fpm/data/ChartDirector/lib/phpchartdir560mt.dll and /dev/null differ