Revert "Simplify codenamemap"

This reverts commit bba8eabf35.

postgres/codenamemap.yaml

@@ -1,23 +1,39 @@
-{%- macro ubuntu_block(name, version) %}
+precise:
- {{ name }}:
+  version: 9.4
-   pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ {{ name }}-pgdg main
+  pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main
-   conf_dir: /etc/postgresql/{{ version }}/main
+  conf_dir: /etc/postgresql/9.4/main
-   prepare_cluster:
+  data_dir: /var/lib/postgresql/9.4/main
-     command: pg_createcluster {{ version }} main
+wheezy:
-     test: test -f /var/lib/postgresql/{{ version }}/main/PG_VERSION && test -f /etc/postgresql/{{ version }}/main/postgresql.conf
+  pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ wheezy-pgdg main
-     user: root
+  conf_dir: /etc/postgresql/9.1/main
-     env:
+  data_dir: /var/lib/postgresql/9.1/main
-       LC_ALL: C.UTF-8
+jessie:
- {%- endmacro %}
+  version: 9.4
-
+  pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ jessie-pgdg main
- {{ ubuntu_block('wheezy', 9.1) }}
+  conf_dir: /etc/postgresql/9.4/main
-
+  data_dir: /var/lib/postgresql/9.4/main
- {{ ubuntu_block('trusty', 9.3) }}
+trusty:
-
+  version: 9.3
- {{ ubuntu_block('precise', 9.4) }}
+  pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main
- {{ ubuntu_block('jessie', 9.4) }}
+  conf_dir: /etc/postgresql/9.3/main
- {{ ubuntu_block('utopic', 9.4) }}
+  data_dir: /var/lib/postgresql/9.3/main
- {{ ubuntu_block('vivid', 9.4) }}
+utopic:
- {{ ubuntu_block('wily', 9.4) }}
+  version: 9.4
-
+  pkg_repo: deb http://apt.postgresql.org/pub/repos/apt/ utopic-pgdg main
- {{ ubuntu_block('xenial', 9.5) }}
+  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