Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2020-05-27 15:34:34 +02:00
commit 9f99fe2c3f

View File

@ -1,6 +1,5 @@
#!/bin/bash
ninegate_synceportail=$(CreoleGet ninegate_synceportail non)
moderegistration=$(CreoleGet ninegate_moderegistration none)
labelsniveau01=$(CreoleGet ninegate_niveau01labels non)
iconniveau01=$(CreoleGet ninegate_niveau01icon non)
@ -13,7 +12,6 @@ websocket_url=$(CreoleGet adresse_ip_eth0 non)
websocket_portinterne=$(CreoleGet ninegate_websocket_portinterne non)
www_dir="$container_path_web/var/www/html"
eportail_dir="$www_dir/eportail"
# Récuper les composer associés à la version de php installé
version72=`php -r 'echo version_compare(phpversion(), "7.2.0", ">=");'`
@ -31,18 +29,21 @@ else
fi
# Installation des dépendances composer
composer install
echo COMPOSER = Install
composer install --quiet
rm -f /var/www/html/ninegate/var/logs/dev.log
# Permissions
./perm.sh www-data
# Nettoyage du cache
rm /var/www/html/ninegate/var/cache -rf
php bin/console cache:clear --env=prod --no-debug
echo
echo CACHE = Refresh
rm /var/www/html/ninegate/var/cache -rf > /dev/null
php bin/console cache:clear --env=prod --no-debug --quiet
# Migration si nécessaire du schéma de la base
php bin/console doctrine:schema:update --force --env=prod --no-debug
php bin/console doctrine:schema:update --force --env=prod --no-debug --quiet
# Insertion data de base
php bin/console Core:InitData --env=prod
@ -53,27 +54,20 @@ php bin/console Portal:InitData --env=prod
php bin/console Core:Script --env=prod
# Generation des assets
bin/console assetic:dump --env=prod
echo ASSET = Dump
bin/console assetic:dump --env=prod --quiet
# Copie des polices du projet dans le rep web
cp -rf src/Cadoles/CoreBundle/Resources/public/fonts web/
# Pointer le repertoire des avatar d'eportail sur celui de draaf
# Paramétrage eportail
if [[ "$ninegate_synceportail" = 'oui' ]]
then
if [[ ! -L /var/www/html/eportail/local/images/avatar ]]
then
rm -rf /var/www/html/eportail/local/images/avatar
ln -s /var/www/html/ninegate/web/uploads/avatar /var/www/html/eportail/local/images/avatar
fi
fi
# Permissions
./perm.sh www-data
# Server Websocket
if [[ "$ninegate_websocket" = 'oui' ]]
then
echo
/var/www/html/ninegate/scripts/ninegate-websocket.sh
fi
fi
echo