Merge branch 'travis-ci-xenial'

2 files changed, 8 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 712f247..946345c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 language: c
 
 env:
@@ -39,7 +39,6 @@ before_install:
   - "sudo killall -9 ntpd ||:"
   # Trusty has no swap, lets create some
   - sudo fallocate -l 20M /swapfile; sudo chmod 600 /swapfile; sudo mkswap /swapfile; sudo swapon /swapfile
-  - sudo add-apt-repository -y ppa:waja/trusty-backports
   - sudo apt-get update -qq
   - sudo apt-get purge -qq gawk
 
@@ -52,7 +51,7 @@ install:
   - sudo apt-get install -qq --no-install-recommends autoconf automake
   - sudo apt-get install -qq --no-install-recommends faketime
   - sudo apt-get install -qq --no-install-recommends libmonitoring-plugin-perl
-  - sudo apt-get install -qq --no-install-recommends squid3
+  - sudo apt-get install -qq --no-install-recommends squid
   # Trusty related dependencies (not yet provided)
   - 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
   # enable ssl apache
@@ -60,8 +59,9 @@ install:
   - sudo a2ensite default-ssl
   - sudo make-ssl-cert generate-default-snakeoil --force-overwrite
   - sudo service apache2 reload
-  - sudo cp tools/squid.conf /etc/squid3/squid.conf
-  - sudo service squid3 reload
+  - sudo cp tools/squid.conf /etc/squid/squid.conf
+  - sudo service squid reload
+  - sudo service mysql restart
 
 before_script:
   # ensure we have a test database in place for tests
@@ -73,8 +73,8 @@ before_script:
   - make
   - export NPTEST_ACCEPTDEFAULT=1
   - export NPTEST_CACHE="$(pwd)/plugins/t/NPTest.cache.travis"
-  - ssh-keygen -t dsa -N "" -f ~/.ssh/id_dsa
-  - cat ~/.ssh/id_dsa.pub >> ~/.ssh/authorized_keys
+  - ssh-keygen -t rsa -N "" -f ~/.ssh/id_rsa
+  - cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
   - ssh-keyscan localhost >> ~/.ssh/known_hosts
   - touch ~/.ssh/config
   - sudo rm -f /usr/share/mibs/ietf/SNMPv2-PDU /usr/share/mibs/ietf/IPSEC-SPD-MIB /usr/share/mibs/ietf/IPATM-IPMC-MIB /usr/share/mibs/iana/IANA-IPPM-METRICS-REGISTRY-MIB
diff --git a/plugins/t/NPTest.cache.travis b/plugins/t/NPTest.cache.travis
index 6ee4505..9b9f805 100644
--- a/plugins/t/NPTest.cache.travis
+++ b/plugins/t/NPTest.cache.travis
@@ -50,5 +50,5 @@
   'NP_SNMP_USER' => '',
   'NP_SSH_CONFIGFILE' => '~/.ssh/config',
   'NP_SSH_HOST' => 'localhost',
-  'NP_SSH_IDENTITY' => '~/.ssh/id_dsa'
+  'NP_SSH_IDENTITY' => '~/.ssh/id_rsa'
 }