Simplify codenamemap

postgres/codenamemap.yaml

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