diff --git a/README.md b/README.md index 93f5812..90001f3 100644 --- a/README.md +++ b/README.md @@ -35,6 +35,10 @@ TODO. lc_collate: 'en_US.UTF-8' # optional lc_ctype: 'en_US.UTF-8' # optional encoding: 'UTF-8' # optional + login_host: example.com # optional, defaults to 'localhost' + login_password: supersecure # optional + login_user: admin # optional, defaults to 'postgres' + port: 5432 # optional TODO. diff --git a/defaults/main.yml b/defaults/main.yml index 2ddfae2..b4ec502 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -13,6 +13,11 @@ postgresql_databases: [] # lc_collate: 'en_US.UTF-8' # optional # lc_ctype: 'en_US.UTF-8' # optional # encoding: 'UTF-8' # optional + # login_host: example.com # optional, defaults to 'localhost' + # login_password: supersecure # optional + # login_user: admin # optional, defaults to 'postgres' + # port: 5432 # optional + # state: present # optional, defaults to 'present' # Users to ensure exist. postgresql_users: [] diff --git a/tasks/databases.yml b/tasks/databases.yml index 338b7b3..7d49784 100644 --- a/tasks/databases.yml +++ b/tasks/databases.yml @@ -5,5 +5,9 @@ lc_collate: "{{ item.lc_collate | default('en_US.UTF-8') }}" lc_ctype: "{{ item.lc_ctype | default('en_US.UTF-8') }}" encoding: "{{ item.encoding | default('UTF-8') }}" - state: present + login_host: "{{ item.login_host | default('localhost') }}" + login_password: "{{ item.login_password | default(omit) }}" + login_user: "{{ item.login_user | default('postgres') }}" + port: "{{ item.port | default('5432') }}" + state: "{{ item.state | default('present') }}" with_items: "{{ postgresql_databases }}" diff --git a/vars/Debian-8.yml b/vars/Debian-8.yml index 0d08efc..1b88dec 100644 --- a/vars/Debian-8.yml +++ b/vars/Debian-8.yml @@ -1,5 +1,5 @@ --- -__postgresql_version: "9.5" +__postgresql_version: "9.4" __postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin" __postgresql_daemon: postgresql __postgresql_packages: diff --git a/vars/Ubuntu-14.yml b/vars/Ubuntu-14.yml index 0d08efc..23f07cf 100644 --- a/vars/Ubuntu-14.yml +++ b/vars/Ubuntu-14.yml @@ -1,5 +1,5 @@ --- -__postgresql_version: "9.5" +__postgresql_version: "9.3" __postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin" __postgresql_daemon: postgresql __postgresql_packages: