diff --git a/src/freedombone-app-kanboard b/src/freedombone-app-kanboard index 2905994e..a33da4ef 100755 --- a/src/freedombone-app-kanboard +++ b/src/freedombone-app-kanboard @@ -560,6 +560,10 @@ function install_kanboard { logging_off_kanboard initialise_database kanboard /var/www/${KANBOARD_DOMAIN_NAME}/htdocs/app/Schema/Sql/mysql.sql + chown -R www-data:www-data /var/www/${KANBOARD_DOMAIN_NAME}/htdocs + + cd /var/www/${KANBOARD_DOMAIN_NAME}/htdocs + install_composer systemctl restart mariadb systemctl restart php7.0-fpm diff --git a/src/freedombone-app-koel b/src/freedombone-app-koel index 296281b7..95225708 100755 --- a/src/freedombone-app-koel +++ b/src/freedombone-app-koel @@ -715,21 +715,9 @@ function install_koel { install_koel_main cd /var/www/$KOEL_DOMAIN_NAME/htdocs + install_composer - # curl -sS https://getcomposer.org/installer | php - if [ -f ~/freedombone/image_build/composer_install ]; then - cat ~/freedombone/image_build/composer_install | php - else - if [ -f /home/$MY_USERNAME/freedombone/image_build/composer_install ]; then - cat /home/$MY_USERNAME/freedombone/image_build/composer_install | php - fi - fi npm install -g yarn - php composer.phar install - if [ ! "$?" = "0" ]; then - echo $'Unable to run composer install' - exit 7252198 - fi npm install function_check get_mariadb_password diff --git a/src/freedombone-app-movim b/src/freedombone-app-movim index 6cfa3cf7..52f0bb0b 100755 --- a/src/freedombone-app-movim +++ b/src/freedombone-app-movim @@ -383,15 +383,8 @@ function install_movim { # Fix typo sed -i 's|weksocket|websocket|g' app/widgets/AdminTest/admintest.js - # curl -sS https://getcomposer.org/installer | php - if [ -f ~/freedombone/image_build/composer_install ]; then - cat ~/freedombone/image_build/composer_install | php - else - if [ -f /home/$MY_USERNAME/freedombone/image_build/composer_install ]; then - cat /home/$MY_USERNAME/freedombone/image_build/composer_install | php - fi - fi - php composer.phar install + cd /var/www/$MOVIM_DOMAIN_NAME/htdocs + install_composer cd /var/www/$MOVIM_DOMAIN_NAME/htdocs/config cp db.example.inc.php db.inc.php diff --git a/src/freedombone-utils-web b/src/freedombone-utils-web index 27a29748..242e8a90 100755 --- a/src/freedombone-utils-web +++ b/src/freedombone-utils-web @@ -917,4 +917,20 @@ function create_default_web_site { fi } +function install_composer { + # curl -sS https://getcomposer.org/installer | php + if [ -f ~/${PROJECT_NAME}/image_build/composer_install ]; then + cat ~/${PROJECT_NAME}/image_build/composer_install | php + else + if [ -f /home/$MY_USERNAME/${PROJECT_NAME}/image_build/composer_install ]; then + cat /home/$MY_USERNAME/${PROJECT_NAME}/image_build/composer_install | php + fi + fi + php composer.phar install + if [ ! "$?" = "0" ]; then + echo $'Unable to run composer install' + exit 7252198 + fi +} + # NOTE: deliberately no exit 0