Fix CI build

.travis.yml

@@ -10,25 +10,23 @@ env:
   - PGVERSION=9.5
   - PGVERSION=9.4
   - PGVERSION=9.3
-  - PGVERSION=9.2
-  - PGVERSION=9.1
-  - PGVERSION=9.0
-  - PGVERSION=8.4
 
 dist: focal
 sudo: required
 language: perl
 perl:
-  - '5.30'
+  - '5.30.0'
   - '5.14' # 5.14 is shipped with Ubuntu precise (12.04), also oldest version supported by Travis on focal
 
 before_install:
   - sudo apt-get -qq update
 
 install:
-  # upgrade postgresql-common for new apt.postgresql.org.sh
-  - sudo apt-get install -y postgresql-common
-  - sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -p -v $PGVERSION -i
+  - sudo apt-get install curl ca-certificates gnupg
+  - curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+  - sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+  - sudo apt-get update
+  - sudo apt-get install postgresql-$PGVERSION
   - pg_lsclusters
   - dpkg -l postgresql\* | cat
   - printenv | sort

README.md

@@ -1,7 +1,7 @@
 check_postgres
 ==============
 
-[![Build Status](https://travis-ci.org/bucardo/check_postgres.svg?branch=master)](https://travis-ci.org/bucardo/check_postgres)
+[![Build Status](https://travis-ci.com/bucardo/check_postgres.svg?branch=master)](https://travis-ci.com/bucardo/check_postgres)
 
 This is check_postgres, a monitoring tool for Postgres.
 
@@ -14,8 +14,8 @@ This document will cover how to install the script.
 Quick method
 ------------
 
-For the impatient Nagios admin, just copy the "check_postgres.pl" file 
-to your Nagios scripts directory, and perhaps symlink entries to that 
+For the impatient Nagios admin, just copy the "check_postgres.pl" file
+to your Nagios scripts directory, and perhaps symlink entries to that
 file by:
 
     cd <the directory you just copied the file to>
@@ -35,17 +35,17 @@ The better way to install this script is via the standard Perl process:
     env -i make test
     make install
 
-The last step usually needs to be done as the root user. You may want to 
-copy the script to a place that makes more sense for Nagios, if using it 
+The last step usually needs to be done as the root user. You may want to
+copy the script to a place that makes more sense for Nagios, if using it
 for that purpose. See the "Quick" instructions above.
 
-For `make test`, please report any failing tests to check_postgres@bucardo.org. 
-The tests need to have some standard Postgres binaries available, such as 
-`initdb`, `psql`, and `pg_ctl`. If these are not in your path, or you want to 
-use specific ones, please set the environment variable `PGBINDIR` first. More 
+For `make test`, please report any failing tests to check_postgres@bucardo.org.
+The tests need to have some standard Postgres binaries available, such as
+`initdb`, `psql`, and `pg_ctl`. If these are not in your path, or you want to
+use specific ones, please set the environment variable `PGBINDIR` first. More
 details on running the testsuite are available in `README.dev`.
 
-Once `make install` has been done, you should have access to the complete 
+Once `make install` has been done, you should have access to the complete
 documentation by typing:
 
     man check_postgres
@@ -57,13 +57,13 @@ https://bucardo.org/check_postgres/check_postgres.pl.html
 Mailing lists
 -------------
 
-The final step should be to subscribe to the low volume check_postgres-announce 
-mailing list, so you learn of new versions and important changes. Information 
+The final step should be to subscribe to the low volume check_postgres-announce
+mailing list, so you learn of new versions and important changes. Information
 on joining can be found at:
 
 https://mail.endcrypt.com/mailman/listinfo/check_postgres-announce
 
-General questions and development issues are discussed on the check_postgres list, 
+General questions and development issues are discussed on the check_postgres list,
 which we recommend people join as well:
 
 https://mail.endcrypt.com/mailman/listinfo/check_postgres
@@ -81,22 +81,22 @@ COPYRIGHT
 LICENSE INFORMATION
 -------------------
 
-Redistribution and use in source and binary forms, with or without 
+Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
-  1. Redistributions of source code must retain the above copyright notice, 
+  1. Redistributions of source code must retain the above copyright notice,
      this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the above copyright notice, 
-     this list of conditions and the following disclaimer in the documentation 
+  2. Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED 
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
 OF SUCH DAMAGE.