diff --git a/.travis.yml b/.travis.yml index 8fed42cc..0bb4a0e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,14 @@ script: - sudo echo "Travis Banch = $TRAVIS_BRANCH" - sudo bash -x bin/install.sh $TRAVIS_BRANCH +- sudo ee system install nginx +- sudo ee system install php +- sudo ee system install mysql +- sudo ee system install postfix +- sudo ee system install phpmyadmin +- sudo ee system install adminer + + - sudo cat /var/log/easyengine/* - sudo ls -lah /usr/local/sbin diff --git a/bin/easyengine b/bin/easyengine index f678ace8..828979aa 100644 --- a/bin/easyengine +++ b/bin/easyengine @@ -37,7 +37,7 @@ then then if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ]; then - # Setup repository + # Setup nginx/php repository ee_mod_repo_$EE_THIRD # Fix GnuPG key @@ -47,16 +47,21 @@ then # Execute: apt-get update ee_lib_apt_get_update - # Install nginx package - ee_mod_install_$EE_THIRD + if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ] || [ "$EE_THIRD" = "postfix" ]; then + # Install nginx/php/mysql/postfix package + ee_mod_install_$EE_THIRD + elif [ "$EE_THIRD" = "adminer" ] || [ "$EE_THIRD" = "phpmyadmin" ] + # Install phpmyadmin/adminer + ee_ven_install_$EE_THIRD + fi if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ]; then - # Setup nginx + # Setup nginx/php/mysql ee_mod_setup_$EE_THIRD fi if [ "$EE_THIRD" = "nginx" ] || [ "$EE_THIRD" = "php" ] || [ "$EE_THIRD" = "mysql" ] || [ "$EE_THIRD" = "postfix" ]; then - # Restart nginx + # Restart nginx/php/mysql/postfix ee_lib_service $EE_THIRD restart # Initialize Git