From 982ee93f9a1da52d4c61fc8ae9ec8e4af782bed0 Mon Sep 17 00:00:00 2001
From: Tim Goodaire <tgoodaire@dyn.com>
Date: Thu, 7 Jul 2016 16:05:35 -0400
Subject: [PATCH] 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