summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorHolger Weiss <holger@zedat.fu-berlin.de>2018-11-06 11:49:18 (GMT)
committerHolger Weiss <holger@zedat.fu-berlin.de>2018-11-06 11:49:18 (GMT)
commit0863a4cb93a069523b7fca8a29e60e27070125e8 (patch)
tree44d15f8f27f38e5e6b60f49a9fa2eab2d266772b /.travis.yml
parent82a634f7bfa433b78560be45ae6b52e1d101a26a (diff)
parent198611a3c2bd89562af87d8bf0c7584fce1ce037 (diff)
downloadmonitoring-plugins-0863a4cb93a069523b7fca8a29e60e27070125e8.tar.gz
Merge remote-tracking branch 'monitoring-plugins/pr/1476'
* monitoring-plugins/pr/1476: test: Add proxy tests via proxy Allow user to specify HTTP method after proxy CONNECT
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml4
1 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 617c415..123e178 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,6 +55,7 @@ install:
55 - sudo apt-get install -qq --no-install-recommends autoconf automake 55 - sudo apt-get install -qq --no-install-recommends autoconf automake
56 - sudo apt-get install -qq --no-install-recommends faketime 56 - sudo apt-get install -qq --no-install-recommends faketime
57 - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl 57 - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl
58 - sudo apt-get install -qq --no-install-recommends squid3
58 # Trusty related dependencies (not yet provided) 59 # Trusty related dependencies (not yet provided)
59 - 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 60 - 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
60 # enable ssl apache 61 # enable ssl apache
@@ -62,6 +63,8 @@ install:
62 - sudo a2ensite default-ssl 63 - sudo a2ensite default-ssl
63 - sudo make-ssl-cert generate-default-snakeoil --force-overwrite 64 - sudo make-ssl-cert generate-default-snakeoil --force-overwrite
64 - sudo service apache2 reload 65 - sudo service apache2 reload
66 - sudo cp tools/squid.conf /etc/squid3/squid.conf
67 - sudo service squid3 reload
65 68
66before_script: 69before_script:
67 # ensure we have a test database in place for tests 70 # ensure we have a test database in place for tests
@@ -93,4 +96,3 @@ notifications:
93 skip_join: true 96 skip_join: true
94 email: 97 email:
95 # - team@monitoring-plugins.org 98 # - team@monitoring-plugins.org
96