diff --git a/.travis.yml b/.travis.yml index 85c1dfc5..514f02e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,6 @@ before_script: - if [[ "$DB" == "pgsql" ]]; then psql -c "DROP DATABASE IF EXISTS shimmie;" -U postgres; fi - if [[ "$DB" == "pgsql" ]]; then psql -c "create database shimmie;" -U postgres; fi - if [[ "$DB" == "mysql" ]]; then mysql -e "create database shimmie;" -uroot; fi - # shimmie needs to be able to create directories for images, etc. - # (permissions of 777 are bad, but it definitely works) - - chmod -R 777 . script: php tests/test_install.php -d $DB diff --git a/tests/setup_test_env.sh b/tests/setup_test_env.sh index dfc5fe6e..46b862a0 100644 --- a/tests/setup_test_env.sh +++ b/tests/setup_test_env.sh @@ -11,7 +11,7 @@ set -e # Install the necessary packages -sudo apt-get install -y nginx realpath php5-fpm php-mysql --fix-missing +sudo apt-get install -y nginx realpath php5-fpm php5-mysql --fix-missing # Stop the daemons sudo service nginx stop @@ -19,6 +19,10 @@ sudo /etc/init.d/php5-fpm stop SHIMMIE_ROOT=$(realpath "$0") +# shimmie needs to be able to create directories for images, etc. +# (permissions of 777 are bad, but it definitely works) +sudo chmod -R 0777 $SHIMMIE_ROOT + NGINX_CONF="/etc/nginx/sites-enabled/default" # nginx configuration