From bba8eabf3597d84b20ac16d21689e0cea8f4a728 Mon Sep 17 00:00:00 2001 From: Tim Goodaire Date: Thu, 7 Jul 2016 15:41:44 -0400 Subject: [PATCH 1/3] Simplify codenamemap --- postgres/codenamemap.yaml | 62 +++++++++++++++------------------------ 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml index 8cb1b2d..285b634 100644 --- a/postgres/codenamemap.yaml +++ b/postgres/codenamemap.yaml @@ -1,39 +1,23 @@ -precise: - version: 9.4 - pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main - conf_dir: /etc/postgresql/9.4/main - data_dir: /var/lib/postgresql/9.4/main -wheezy: - pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main - conf_dir: /etc/postgresql/9.1/main - data_dir: /var/lib/postgresql/9.1/main -jessie: - version: 9.4 - pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main - conf_dir: /etc/postgresql/9.4/main - data_dir: /var/lib/postgresql/9.4/main -trusty: - version: 9.3 - pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main - conf_dir: /etc/postgresql/9.3/main - data_dir: /var/lib/postgresql/9.3/main -utopic: - version: 9.4 - pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main - conf_dir: /etc/postgresql/9.4/main - data_dir: /var/lib/postgresql/9.4/main -vivid: - version: 9.4 - pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main - conf_dir: /etc/postgresql/9.4/main - data_dir: /var/lib/postgresql/9.4/main -wily: - version: 9.4 - pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wily-pgdg main - conf_dir: /etc/postgresql/9.4/main - data_dir: /var/lib/postgresql/9.4/main -xenial: - version: 9.5 - pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main - conf_dir: /etc/postgresql/9.5/main - data_dir: /var/lib/postgresql/9.5/main +{%- macro ubuntu_block(name, version) %} + {{ name }}: + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ {{ name }}-pgdg main + conf_dir: /etc/postgresql/{{ version }}/main + prepare_cluster: + command: pg_createcluster {{ version }} main + test: test -f /var/lib/postgresql/{{ version }}/main/PG_VERSION && test -f /etc/postgresql/{{ version }}/main/postgresql.conf + user: root + env: + LC_ALL: C.UTF-8 + {%- endmacro %} + + {{ ubuntu_block('wheezy', 9.1) }} + + {{ ubuntu_block('trusty', 9.3) }} + + {{ ubuntu_block('precise', 9.4) }} + {{ ubuntu_block('jessie', 9.4) }} + {{ ubuntu_block('utopic', 9.4) }} + {{ ubuntu_block('vivid', 9.4) }} + {{ ubuntu_block('wily', 9.4) }} + + {{ ubuntu_block('xenial', 9.5) }} From 982ee93f9a1da52d4c61fc8ae9ec8e4af782bed0 Mon Sep 17 00:00:00 2001 From: Tim Goodaire Date: Thu, 7 Jul 2016 16:05:35 -0400 Subject: [PATCH 2/3] Revert "Simplify codenamemap" This reverts commit bba8eabf3597d84b20ac16d21689e0cea8f4a728. --- postgres/codenamemap.yaml | 62 ++++++++++++++++++++++++--------------- 1 file changed, 39 insertions(+), 23 deletions(-) diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml index 285b634..8cb1b2d 100644 --- a/postgres/codenamemap.yaml +++ b/postgres/codenamemap.yaml @@ -1,23 +1,39 @@ -{%- macro ubuntu_block(name, version) %} - {{ name }}: - pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ {{ name }}-pgdg main - conf_dir: /etc/postgresql/{{ version }}/main - prepare_cluster: - command: pg_createcluster {{ version }} main - test: test -f /var/lib/postgresql/{{ version }}/main/PG_VERSION && test -f /etc/postgresql/{{ version }}/main/postgresql.conf - user: root - env: - LC_ALL: C.UTF-8 - {%- endmacro %} - - {{ ubuntu_block('wheezy', 9.1) }} - - {{ ubuntu_block('trusty', 9.3) }} - - {{ ubuntu_block('precise', 9.4) }} - {{ ubuntu_block('jessie', 9.4) }} - {{ ubuntu_block('utopic', 9.4) }} - {{ ubuntu_block('vivid', 9.4) }} - {{ ubuntu_block('wily', 9.4) }} - - {{ ubuntu_block('xenial', 9.5) }} +precise: + version: 9.4 + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main + conf_dir: /etc/postgresql/9.4/main + data_dir: /var/lib/postgresql/9.4/main +wheezy: + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main + conf_dir: /etc/postgresql/9.1/main + data_dir: /var/lib/postgresql/9.1/main +jessie: + version: 9.4 + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main + conf_dir: /etc/postgresql/9.4/main + data_dir: /var/lib/postgresql/9.4/main +trusty: + version: 9.3 + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main + conf_dir: /etc/postgresql/9.3/main + data_dir: /var/lib/postgresql/9.3/main +utopic: + version: 9.4 + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main + conf_dir: /etc/postgresql/9.4/main + data_dir: /var/lib/postgresql/9.4/main +vivid: + version: 9.4 + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main + conf_dir: /etc/postgresql/9.4/main + data_dir: /var/lib/postgresql/9.4/main +wily: + version: 9.4 + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wily-pgdg main + conf_dir: /etc/postgresql/9.4/main + data_dir: /var/lib/postgresql/9.4/main +xenial: + version: 9.5 + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ xenial-pgdg main + conf_dir: /etc/postgresql/9.5/main + data_dir: /var/lib/postgresql/9.5/main From c16c78a38e0ff1125abf1a7ecf96cb0f8b8c46e1 Mon Sep 17 00:00:00 2001 From: Tim Goodaire Date: Fri, 8 Jul 2016 16:03:55 -0400 Subject: [PATCH 3/3] Removed leading spaces --- postgres/codenamemap.yaml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/postgres/codenamemap.yaml b/postgres/codenamemap.yaml index 277aa47..10052ba 100644 --- a/postgres/codenamemap.yaml +++ b/postgres/codenamemap.yaml @@ -1,19 +1,19 @@ {%- macro ubuntu_block(name, version) %} - {{ name }}: - version: {{ version }} - pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ {{ name }}-pgdg main - conf_dir: /etc/postgresql/{{ version }}/main - data_dir: /var/lib/postgresql/{{ version }}/main - {%- endmacro %} +{{ name }}: + version: {{ version }} + pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ {{ name }}-pgdg main + conf_dir: /etc/postgresql/{{ version }}/main + data_dir: /var/lib/postgresql/{{ version }}/main +{%- endmacro %} - {{ ubuntu_block('wheezy', 9.1) }} +{{ ubuntu_block('wheezy', 9.1) }} - {{ ubuntu_block('trusty', 9.3) }} +{{ ubuntu_block('trusty', 9.3) }} - {{ ubuntu_block('precise', 9.4) }} - {{ ubuntu_block('jessie', 9.4) }} - {{ ubuntu_block('utopic', 9.4) }} - {{ ubuntu_block('vivid', 9.4) }} - {{ ubuntu_block('wily', 9.4) }} +{{ ubuntu_block('precise', 9.4) }} +{{ ubuntu_block('jessie', 9.4) }} +{{ ubuntu_block('utopic', 9.4) }} +{{ ubuntu_block('vivid', 9.4) }} +{{ ubuntu_block('wily', 9.4) }} - {{ ubuntu_block('xenial', 9.5) }} +{{ ubuntu_block('xenial', 9.5) }}