diff options
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index d7716fa3..43e8ee87 100644 --- a/.travis.yml +++ b/.travis.yml | |||
| @@ -51,7 +51,7 @@ install: | |||
| 51 | - sudo apt-get install -qq --no-install-recommends autoconf automake | 51 | - sudo apt-get install -qq --no-install-recommends autoconf automake |
| 52 | - sudo apt-get install -qq --no-install-recommends faketime | 52 | - sudo apt-get install -qq --no-install-recommends faketime |
| 53 | - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl | 53 | - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl |
| 54 | - sudo apt-get install -qq --no-install-recommends squid3 | 54 | - sudo apt-get install -qq --no-install-recommends squid |
| 55 | # Trusty related dependencies (not yet provided) | 55 | # Trusty related dependencies (not yet provided) |
| 56 | - test "$(dpkg -l | grep -E "mysql-(client|server)-[0-9].[0-9]" | grep -c ^ii)" -gt 0 || sudo apt-get install -qq --no-install-recommends mariadb-client mariadb-server | 56 | - test "$(dpkg -l | grep -E "mysql-(client|server)-[0-9].[0-9]" | grep -c ^ii)" -gt 0 || sudo apt-get install -qq --no-install-recommends mariadb-client mariadb-server |
| 57 | # enable ssl apache | 57 | # enable ssl apache |
| @@ -59,8 +59,8 @@ install: | |||
| 59 | - sudo a2ensite default-ssl | 59 | - sudo a2ensite default-ssl |
| 60 | - sudo make-ssl-cert generate-default-snakeoil --force-overwrite | 60 | - sudo make-ssl-cert generate-default-snakeoil --force-overwrite |
| 61 | - sudo service apache2 reload | 61 | - sudo service apache2 reload |
| 62 | - sudo cp tools/squid.conf /etc/squid3/squid.conf | 62 | - sudo cp tools/squid.conf /etc/squid/squid.conf |
| 63 | - sudo service squid3 reload | 63 | - sudo service squid reload |
| 64 | 64 | ||
| 65 | before_script: | 65 | before_script: |
| 66 | # ensure we have a test database in place for tests | 66 | # ensure we have a test database in place for tests |