From 75253869ec166d01ad8821250ce196d5e2d9478f Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 18 Apr 2017 09:17:40 -0700 Subject: [PATCH] Add use_pg_96 option to install Postgresql 9.6 ... instead of the Ubuntu 16.04 default of installing PG 9.6 Signed-off-by: Bill Erickson --- evergreen/database.yml | 23 ++++++++++++++++++++++- settings.yml | 1 + 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/evergreen/database.yml b/evergreen/database.yml index e28465f5a..936c7c92d 100644 --- a/evergreen/database.yml +++ b/evergreen/database.yml @@ -2,12 +2,33 @@ apt: name={{item}} state=present with_items: - python-psycopg2 # required by postgresql_user - - pgtap - name: Install Postgres Dependencies shell: > cd {{repo_base}}/Evergreen && PERL_MM_USE_DEFAULT=1 make -f Open-ILS/src/extras/Makefile.install postgres-server-{{os_build_target}} + when: not use_pg_96 +# When PG 9.6 is enabled, add the repository then peform the +# equivalent of the postgres-server-{{os_build_target}} steps. +- block: + - name: Add Postgresql 9.6 Apt Repository + shell: add-apt-repository "deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main" + - name: Add Postgresql 9.6 Apt Repository Key + shell: wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - + - name: Install Postgresql 9.6 Server + apt: + update_cache: yes + name: "{{item}}" + state: present + with_items: + - postgresql-9.6 + - postgresql-contrib-9.6 + - postgresql-plperl-9.6 + - postgresql-server-dev-9.6 + when: use_pg_96 +# Install pgtap after PG server to avoid multiple PG server instances +- name: Install PGTAP + apt: name=pgtap state=present - name: Start Postgres service: name=postgresql state=started - name: Create DB User diff --git a/settings.yml b/settings.yml index 98510f9e5..d6fb53d95 100644 --- a/settings.yml +++ b/settings.yml @@ -17,6 +17,7 @@ eg_admin_pass: demo123 ejabberd_password: password domain_name: localhost install_database: true +use_pg_96: false database_host: 127.0.0.1 database_port: 5432 database_user: evergreen -- 2.11.0