format condition

This commit is contained in:
Michael RICOIS 2016-12-02 10:38:11 +01:00
parent 212d4f27db
commit 620a4fc712
2 changed files with 32 additions and 64 deletions

View File

@ -8,16 +8,14 @@ MARIADB_VERSION="10.1"
PHPMYADMIN_VERSION="4.6.3"
# --- Add a file action.upgrade to perfom a system upgrade
if [ -f $DIR/action.upgrade ]
then
if [ -f $DIR/action.upgrade ]; then
sudo apt-get update
sudo apt-get -y upgrade
sudo rm -rf $DIR/action.upgrade
fi
# --- Installation Wkhtmltopdf
if [ ! -f /usr/local/bin/wkhtmltopdf ]
then
if [ ! -f /usr/local/bin/wkhtmltopdf ]; then
sudo apt-get install libxrender1 libfontconfig1
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
@ -26,11 +24,9 @@ then
fi
# --- Database
if [ $VARGANTDEV -eq 1 ]
then
if [ $VARGANTDEV -eq 1 ]; then
# --- Installation MariaDB
if [ ! -f /etc/mysql/vagrant ]
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 0xcbcb082a1bb943db
sudo add-apt-repository 'deb [arch=amd64,i386] http://ftp.igh.cnrs.fr/pub/mariadb/repo/10.1/ubuntu trusty main'
@ -45,8 +41,7 @@ then
fi
else
# --- Installation MySQL Server
if [ ! -f /etc/mysql/vagrant ]
then
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 mysql-client
@ -58,16 +53,14 @@ else
fi
# --- PHP
if [ ! -f /usr/bin/php5 ]
then
if [ ! -f /usr/bin/php5 ]; then
# Get apache2.4 from backports
sudo cp -f $DIRDATA/apt/preferences /etc/apt/preferences
# Install
sudo apt-get update
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
if [ $VARGANTDEV -eq 1 ]; then
sudo apt-get -y install php5-xdebug
fi
sudo a2enmod autoindex deflate expires headers rewrite actions proxy proxy_fcgi
@ -75,16 +68,14 @@ then
sudo a2enconf phpfcgi
# --- Configuration PHP / CLI
if [ -f /etc/php5/cli/php.ini ]
then
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/;mbstring.internal_encoding = UTF-8/mbstring.internal_encoding = UTF-8/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 FPM
if [ -f /etc/php5/fpm/php.ini ]
then
if [ -f /etc/php5/fpm/php.ini ]; then
sudo sed -i -e 's/max_execution_time = 30/max_execution_time = 300/g' /etc/php5/fpm/php.ini
sudo sed -i -e 's/short_open_tag = Off/short_open_tag = On/g' /etc/php5/fpm/php.ini
sudo sed -i -e 's/;mbstring.internal_encoding = UTF-8/mbstring.internal_encoding = UTF-8/g' /etc/php5/fpm/php.ini
@ -101,8 +92,7 @@ then
fi
# --- ChartDirector
if [ ! -f /usr/lib/php5/20121212/chartdir.lic ]
then
if [ ! -f /usr/lib/php5/20121212/chartdir.lic ]; then
sudo cp -R $DIRDATA/ChartDirector/lib/fonts /usr/lib/php5/20121212/
sudo chown -R 777 /usr/lib/php5/20121212/fonts
sudo cp $DIRDATA/ChartDirector/lib/libchartdir.so /usr/lib/php5/20121212/
@ -115,19 +105,16 @@ then
fi
# --- Composer
if [ ! -f /usr/local/bin/composer ]
then
if [ ! -f /usr/local/bin/composer ]; then
curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer
fi
# --- Installation phpMyAdmin
PHPMYADMIN_DIR="phpMyAdmin-$PHPMYADMIN_VERSION-all-languages"
PHPMYADMIN_URL="https://files.phpmyadmin.net/phpMyAdmin"
if [ ! -d "/home/vhosts/$PHPMYADMIN_DIR" ]
then
if [ ! -d "/home/vhosts/$PHPMYADMIN_DIR" ]; then
wget -q "$PHPMYADMIN_URL/$PHPMYADMIN_VERSION/$PHPMYADMIN_DIR.tar.xz" -O "/home/vagrant/$PHPMYADMIN_DIR.tar.xz"
if [ -f "/home/vagrant/$PHPMYADMIN_DIR.tar.xz" ]
then
if [ -f "/home/vagrant/$PHPMYADMIN_DIR.tar.xz" ]; then
tar xJvf "/home/vagrant/$PHPMYADMIN_DIR.tar.xz" --directory /home/vhosts/
mysql -hlocalhost -uroot -p$MYSQL_PASS < /home/vhosts/$PHPMYADMIN_DIR/sql/create_tables.sql
mysql -hlocalhost -uroot -p$MYSQL_PASS < $DIRDATA/Apps/phpmyadmin.sql
@ -138,8 +125,7 @@ then
fi
# --- Configuration Apache
if [ ! -f /etc/apache2/conf-available/httpd.conf ]
then
if [ ! -f /etc/apache2/conf-available/httpd.conf ]; then
sudo echo "ServerName 127.0.0.1" > /etc/apache2/conf-available/httpd.conf
sudo a2enconf httpd
fi
@ -163,8 +149,7 @@ sed -i -e "s/VERSION/$PHPMYADMIN_VERSION/" $DIR/vhosts/phpmyadmin.conf
# --- test.sd.dev
cp -f $DIRDATA/Apache/test.conf $DIR/vhosts/test.conf
if [ ! -d /home/vhosts/test ]
then
if [ ! -d /home/vhosts/test ]; then
sudo mkdir /home/vhosts/test
fi
@ -178,8 +163,7 @@ for f in *.conf; do
if [ $f = "default-ssl.conf" ]; then
continue
fi
if [ -f $f ]
then
if [ -f $f ]; then
sudo cp -vf $f /etc/apache2/sites-available/;
VHOSTS+=" $f"
fi

View File

@ -8,16 +8,14 @@ MARIADB_VERSION="10.1"
PHPMYADMIN_VERSION="4.6.3"
# --- Add a file action.upgrade to perfom a system upgrade
if [ -f $DIR/action.upgrade ]
then
if [ -f $DIR/action.upgrade ]; then
sudo apt-get update
sudo apt-get -y upgrade
sudo rm -rf $DIR/action.upgrade
fi
# --- Installation Wkhtmltopdf
if [ ! -f /usr/local/bin/wkhtmltopdf ]
then
if [ ! -f /usr/local/bin/wkhtmltopdf ]; then
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/
@ -25,11 +23,9 @@ then
fi
# --- Database
if [ $VARGANTDEV -eq 1 ]
then
if [ $VARGANTDEV -eq 1 ]; then
# --- Installation MariaDB
if [ ! -f /etc/mysql/vagrant ]
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'
@ -44,8 +40,7 @@ then
fi
else
# --- Installation MySQL Server
if [ ! -f /etc/mysql/vagrant ]
then
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 mysql-client
@ -57,13 +52,11 @@ else
fi
# --- PHP
if [ ! -f /usr/bin/php5 ]
then
if [ ! -f /usr/bin/php5 ]; then
# Install
sudo apt-get update
sudo apt-get -y install htop unzip apache2 php7.0-fpm php7.0-cli php7.0-apcu php7.0-curl php7.0-xmlrpc php7.0-xsl php7.0-mysql
if [ $VARGANTDEV -eq 1 ]
then
if [ $VARGANTDEV -eq 1 ]; then
sudo apt-get -y install php-xdebug
fi
sudo a2enmod autoindex deflate expires headers rewrite actions proxy proxy_fcgi
@ -71,16 +64,14 @@ then
sudo a2enconf phpfcgi
# --- Configuration PHP / CLI
if [ -f /etc/php/7.0/cli/php.ini ]
then
if [ -f /etc/php/7.0/cli/php.ini ]; then
sudo sed -i -e 's/short_open_tag = Off/short_open_tag = On/g' /etc/php7.0/cli/php.ini
sudo sed -i -e 's/;mbstring.internal_encoding = UTF-8/mbstring.internal_encoding = UTF-8/g' /etc/php7.0/cli/php.ini
sudo sed -i -e 's/;date.timezone =/date.timezone = Europe\/Paris/g' /etc/php7.0/cli/php.ini
fi
# --- Configuration PHP FPM
if [ -f /etc/php/7.0/fpm/php.ini ]
then
if [ -f /etc/php/7.0/fpm/php.ini ]; then
sudo sed -i -e 's/max_execution_time = 30/max_execution_time = 300/g' /etc/php/7.0/fpm/php.ini
sudo sed -i -e 's/short_open_tag = Off/short_open_tag = On/g' /etc/php7.0/fpm/php.ini
sudo sed -i -e 's/;mbstring.internal_encoding = UTF-8/mbstring.internal_encoding = UTF-8/g' /etc/php/7.0/fpm/php.ini
@ -97,8 +88,7 @@ then
fi
# --- ChartDirector
if [ ! -f /usr/lib/php5/20121212/chartdir.lic ]
then
if [ ! -f /usr/lib/php5/20121212/chartdir.lic ]; then
#sudo cp -R $DIRDATA/ChartDirector/lib/fonts /usr/lib/php5/20121212/
#sudo chown -R 777 /usr/lib/php5/20121212/fonts
#sudo cp $DIRDATA/ChartDirector/lib/libchartdir.so /usr/lib/php5/20121212/
@ -111,19 +101,16 @@ then
fi
# --- Composer
if [ ! -f /usr/local/bin/composer ]
then
if [ ! -f /usr/local/bin/composer ]; then
curl -sS https://getcomposer.org/installer | sudo php -- --install-dir=/usr/local/bin --filename=composer
fi
# --- Installation phpMyAdmin
PHPMYADMIN_DIR="phpMyAdmin-$PHPMYADMIN_VERSION-all-languages"
PHPMYADMIN_URL="https://files.phpmyadmin.net/phpMyAdmin"
if [ ! -d "/home/vhosts/$PHPMYADMIN_DIR" ]
then
if [ ! -d "/home/vhosts/$PHPMYADMIN_DIR" ]; then
wget -q "$PHPMYADMIN_URL/$PHPMYADMIN_VERSION/$PHPMYADMIN_DIR.tar.xz" -O "/home/vagrant/$PHPMYADMIN_DIR.tar.xz"
if [ -f "/home/vagrant/$PHPMYADMIN_DIR.tar.xz" ]
then
if [ -f "/home/vagrant/$PHPMYADMIN_DIR.tar.xz" ]; then
tar xJvf "/home/vagrant/$PHPMYADMIN_DIR.tar.xz" --directory /home/vhosts/
mysql -hlocalhost -uroot -p$MYSQL_PASS < /home/vhosts/$PHPMYADMIN_DIR/sql/create_tables.sql
mysql -hlocalhost -uroot -p$MYSQL_PASS < $DIRDATA/Apps/phpmyadmin.sql
@ -134,8 +121,7 @@ then
fi
# --- Configuration Apache
if [ ! -f /etc/apache2/conf-available/httpd.conf ]
then
if [ ! -f /etc/apache2/conf-available/httpd.conf ]; then
sudo echo "ServerName 127.0.0.1" > /etc/apache2/conf-available/httpd.conf
sudo a2enconf httpd
fi
@ -159,8 +145,7 @@ sed -i -e "s/VERSION/$PHPMYADMIN_VERSION/" $DIR/vhosts/phpmyadmin.conf
# --- test.sd.dev
cp -f $DIRDATA/Apache/test.conf $DIR/vhosts/test.conf
if [ ! -d /home/vhosts/test ]
then
if [ ! -d /home/vhosts/test ]; then
sudo mkdir /home/vhosts/test
fi
@ -174,8 +159,7 @@ for f in *.conf; do
if [ $f = "default-ssl.conf" ]; then
continue
fi
if [ -f $f ]
then
if [ -f $f ]; then
sudo cp -vf $f /etc/apache2/sites-available/;
VHOSTS+=" $f"
fi