chg: skip dev dependencies when installing via INSTALL.sh script.

pull/7734/head
Luciano Righetti 2021-09-07 12:33:09 +02:00
parent 18ff6ca7e3
commit cf6b691581
20 changed files with 24 additions and 24 deletions

View File

@ -1037,7 +1037,7 @@ gitPullAllRCLOCAL () {
# Main composer function
composer () {
sudo mkdir -p /var/www/.composer ; sudo chown ${WWW_USER}:${WWW_USER} /var/www/.composer
${SUDO_WWW} sh -c "cd ${PATH_TO_MISP}/app ; php composer.phar install"
${SUDO_WWW} sh -c "cd ${PATH_TO_MISP}/app ; php composer.phar install --no-dev"
}
@ -1469,7 +1469,7 @@ installCake () {
# Make composer cache happy
# /!\ composer on Ubuntu when invoked with sudo -u doesn't set $HOME to /var/www but keeps it /home/misp \!/
sudo mkdir -p /var/www/.composer ; sudo chown ${WWW_USER}:${WWW_USER} /var/www/.composer
${SUDO_WWW} sh -c "cd ${PATH_TO_MISP}/app ;php composer.phar install"
${SUDO_WWW} sh -c "cd ${PATH_TO_MISP}/app ;php composer.phar install --no-dev"
# Enable CakeResque with php-redis
sudo phpenmod redis
@ -2570,7 +2570,7 @@ installCake_RHEL ()
sudo mkdir /usr/share/httpd/.composer
sudo chown $WWW_USER:$WWW_USER /usr/share/httpd/.composer
cd $PATH_TO_MISP/app
$SUDO_WWW php composer.phar install
$SUDO_WWW php composer.phar install --no-dev
sudo dnf install php-pecl-redis php-pecl-ssdeep php-pecl-gnupg -y

View File

@ -1,5 +1,5 @@
; Generated by RHash v1.3.9 on 2021-07-02 at 13:54.25
; Generated by RHash v1.3.9 on 2021-09-07 at 12:30.22
; Written by Kravchenko Aleksey (Akademgorodok) - http://rhash.sf.net/
;
; 162398 13:54.25 2021-07-02 INSTALL.sh
INSTALL.sh 7A77001F5A72A613D79CCB9D8DD52E4940A24624 1A4A66510D15575BF7D369E6CC0551F3421BDA2D7772E5A18DF53B7C87252425 5F495653054CF223A0283D8CB5E903A9422864F473FBEB45A3DFE2C95252E3171C809413318D31AB1CC34B4A5FD4D872 90D438EBF4237155D8647094D905410D7BB8F4B0A70EB444247E9C19D0C749553A28D1F5433A205A37F8CDBEBD7A9F815854CF3CD7B2980D676F37A4DB7776D2
; 162425 12:30.22 2021-09-07 INSTALL.sh
INSTALL.sh 703A2E500533F450DBC44A1F8A92E2FD43848A27 867CBAE82D2BC9D2794622BBAEEEE80D5EB6802E4602F4EB6B4F82677BB6A47D 8CCBFDF6D407C8F5E606DFB0F448EE138120561EFD2705749B57B3CD734E1D42DD94082D7598695FF8BC84E7AC361942 F357713AAAE1419420BDB6C805EA1A9738C3684FE85A26AF71F87F79FDAA15ECF8D7450BBD164532CFB8F70750EEB23BA2C735C3A489047B161D997257556153

View File

@ -1 +1 @@
7a77001f5a72a613d79ccb9d8dd52e4940a24624 INSTALL.sh
703a2e500533f450dbc44a1f8a92e2fd43848a27 INSTALL.sh

View File

@ -1 +1 @@
1a4a66510d15575bf7d369e6cc0551f3421bda2d7772e5a18df53b7c87252425 INSTALL.sh
867cbae82d2bc9d2794622bbaeeee80d5eb6802e4602f4eb6b4f82677bb6a47d INSTALL.sh

View File

@ -1 +1 @@
5f495653054cf223a0283d8cb5e903a9422864f473fbeb45a3dfe2c95252e3171c809413318d31ab1cc34b4a5fd4d872 INSTALL.sh
8ccbfdf6d407c8f5e606dfb0f448ee138120561efd2705749b57b3cd734e1d42dd94082d7598695ff8bc84e7ac361942 INSTALL.sh

View File

@ -1 +1 @@
90d438ebf4237155d8647094d905410d7bb8f4b0a70eb444247e9c19d0c749553a28d1f5433a205a37f8cdbebd7a9f815854cf3cd7b2980d676f37a4db7776d2 INSTALL.sh
f357713aaae1419420bdb6c805ea1a9738c3684fe85a26af71f87f79fdaa15ecf8d7450bbd164532cfb8f70750eeb23ba2c735c3a489047b161d997257556153 INSTALL.sh

View File

@ -355,7 +355,7 @@ installCake_RHEL ()
sudo mkdir /usr/share/httpd/.composer
sudo chown $WWW_USER:$WWW_USER /usr/share/httpd/.composer
cd $PATH_TO_MISP/app
$SUDO_WWW php composer.phar install
$SUDO_WWW php composer.phar install --no-dev
sudo dnf install php-pecl-redis php-pecl-ssdeep php-pecl-gnupg -y

View File

@ -218,7 +218,7 @@ installCake () {
# Make composer cache happy
# /!\ composer on Ubuntu when invoked with sudo -u doesn't set $HOME to /var/www but keeps it /home/misp \!/
sudo mkdir -p /var/www/.composer ; sudo chown ${WWW_USER}:${WWW_USER} /var/www/.composer
${SUDO_WWW} sh -c "cd ${PATH_TO_MISP}/app ;php composer.phar install"
${SUDO_WWW} sh -c "cd ${PATH_TO_MISP}/app ;php composer.phar install --no-dev"
# Enable CakeResque with php-redis
sudo phpenmod redis

View File

@ -210,7 +210,7 @@ installCake () {
# Make composer cache happy
# /!\ composer on Ubuntu when invoked with sudo -u doesn't set $HOME to /var/www but keeps it /home/misp \!/
sudo mkdir -p /var/www/.composer ; sudo chown ${WWW_USER}:${WWW_USER} /var/www/.composer
${SUDO_WWW} sh -c "cd ${PATH_TO_MISP}/app ;php composer.phar install"
${SUDO_WWW} sh -c "cd ${PATH_TO_MISP}/app ;php composer.phar install --no-dev"
# Enable CakeResque with php-redis
sudo phpenmod redis

View File

@ -160,7 +160,7 @@ cd /var/www/MISP/app
# Make composer cache happy
# /!\ composer on Ubuntu when invoked with sudo -u doesn't set $HOME to /var/www but keeps it /home/misp \!/
sudo mkdir /var/www/.composer ; sudo chown www-data:www-data /var/www/.composer
sudo -H -u www-data php composer.phar install
sudo -H -u www-data php composer.phar install --no-dev
# Enable CakeResque with php-redis
sudo phpenmod redis

View File

@ -251,7 +251,7 @@ sudo -H -u www ${PATH_TO_MISP}/venv/bin/pip install .
```bash
# Install CakeResque along with its dependencies if you intend to use the built in background jobs:
cd ${PATH_TO_MISP}/app
sudo -u www php composer.phar install
sudo -u www php composer.phar install --no-dev
# To use the scheduler worker for scheduled tasks, do the following:
sudo -u www cp -fa /usr/local/www/MISP/INSTALL/setup/config.php /usr/local/www/MISP/app/Plugin/CakeResque/Config/config.php

View File

@ -267,7 +267,7 @@ cd ${PATH_TO_MISP}/app
#${SUDO_WWW} $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
#${SUDO_WWW} $RUN_PHP "php composer-setup.php"
#${SUDO_WWW} $RUN_PHP -- php -r "unlink('composer-setup.php');"
${SUDO_WWW} $RUN_PHP "php composer.phar install"
${SUDO_WWW} $RUN_PHP "php composer.phar install --no-dev"
sudo yum install php-redis -y
sudo service rh-php70-php-fpm restart

View File

@ -242,7 +242,7 @@ sudo mkdir /var/www/.composer ; sudo chown ${WWW_USER}:${WWW_USER} /var/www/.com
# ${SUDO_WWW} php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
# ${SUDO_WWW} php composer-setup.php
# ${SUDO_WWW} php -r "unlink('composer-setup.php');"
${SUDO_WWW} php composer.phar install
${SUDO_WWW} php composer.phar install --no-dev
# Enable CakeResque with php-redis
sudo phpenmod redis

View File

@ -206,7 +206,7 @@ ${PATH_TO_MISP}/venv/bin/pip install .
# Install CakeResque along with its dependencies if you intend to use the built in background jobs:
cd ${PATH_TO_MISP}/app
php composer.phar install
php composer.phar install --no-dev
# Enable CakeResque with php-redis
sudo phpenmod redis

View File

@ -862,7 +862,7 @@ gitPullAllRCLOCAL () {
# Main composer function
composer () {
sudo mkdir -p /var/www/.composer ; sudo chown ${WWW_USER}:${WWW_USER} /var/www/.composer
${SUDO_WWW} sh -c "cd ${PATH_TO_MISP}/app ; php composer.phar install"
${SUDO_WWW} sh -c "cd ${PATH_TO_MISP}/app ; php composer.phar install --no-dev"
}

View File

@ -239,7 +239,7 @@ cd $PATH_TO_MISP/app
#('composer-setup.php'); } echo PHP_EOL;"
#sudo -u www env HOME=/tmp php composer-setup.php
#sudo -u www php -r "unlink('composer-setup.php');"
sudo -u www HOME=/tmp php composer.phar install
sudo -u www HOME=/tmp php composer.phar install --no-dev
# To use the scheduler worker for scheduled tasks, do the following:
sudo -u www cp -f $PATH_TO_MISP/INSTALL/setup/config.php $PATH_TO_MISP/app/Plugin/CakeResque/Config/config.php

View File

@ -383,7 +383,7 @@ doas /usr/local/virtualenvs/MISP/bin/pip install git+https://github.com/kbandla/
# Install CakeResque along with its dependencies if you intend to use the built in background jobs:
cd /var/www/htdocs/MISP/app
doas mkdir /var/www/.composer ; doas chown www:www /var/www/.composer
${SUDO_WWW} env HOME=/var/www php composer.phar install
${SUDO_WWW} env HOME=/var/www php composer.phar install --no-dev
# To use the scheduler worker for scheduled tasks, do the following:
${SUDO_WWW} cp -f /var/www/htdocs/MISP/INSTALL/setup/config.php /var/www/htdocs/MISP/app/Plugin/CakeResque/Config/config.php

View File

@ -251,7 +251,7 @@ cd ${PATH_TO_MISP}/app
#${SUDO_WWW} $RUN_PHP -- php -r "if (hash_file('SHA384', 'composer-setup.php') === '$EXPECTED_SIGNATURE') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
#${SUDO_WWW} $RUN_PHP "php composer-setup.php"
#${SUDO_WWW} $RUN_PHP -- php -r "unlink('composer-setup.php');"
${SUDO_WWW} $RUN_PHP "php composer.phar install"
${SUDO_WWW} $RUN_PHP "php composer.phar install --no-dev"
sudo yum install php-redis -y
sudo systemctl restart rh-php72-php-fpm.service

View File

@ -218,7 +218,7 @@ sudo mkdir /var/www/.composer ; sudo chown ${WWW_USER}:${WWW_USER} /var/www/.com
#${SUDO_WWW} php -r "if (hash_file('SHA384', 'composer-setup.php') === 'baf1608c33254d00611ac1705c1d9958c817a1a33bce370c0595974b342601bd80b92a3f46067da89e3b06bff421f182') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"
#${SUDO_WWW} php composer-setup.php
#${SUDO_WWW} php -r "unlink('composer-setup.php');"
${SUDO_WWW} php composer.phar install
${SUDO_WWW} php composer.phar install --no-dev
# The following is potentially not needed, but just here in case of Keyboard/Chair failures
${SUDO_WWW} php composer.phar update

View File

@ -231,7 +231,7 @@ function installMISPonTsurugi() {
cd ${PATH_TO_MISP}/app
mkdir /var/www/.composer ; chown www-data:www-data /var/www/.composer
${SUDO_WWW} php composer.phar install
${SUDO_WWW} php composer.phar install --no-dev
${SUDO_WWW} cp -fa ${PATH_TO_MISP}/INSTALL/setup/config.php ${PATH_TO_MISP}/app/Plugin/CakeResque/Config/config.php