From 1cb5d90536de7fbbc812149c3c5f57842766342e Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Sun, 13 Jan 2019 21:21:51 +0100 Subject: Update to debian9 --- ansible/roles/postgres/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ansible/roles/postgres/tasks') diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 9adeafe..3073046 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -3,12 +3,12 @@ name: "{{ item }}" state: present with_items: - - postgresql-9.4 + - postgresql - python-psycopg2 - sudo - name: Drop postgresql-config copy: - dest: /etc/postgresql/9.4/main/postgresql.conf + dest: /etc/postgresql/9.6/main/postgresql.conf src: postgresql.conf - name: Add db to hosts lineinfile: -- cgit v1.2.3 From 7caeb2c763270636261dba584ba489d9e66aca4f Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Mon, 14 Jan 2019 15:54:37 +0100 Subject: Change to new ansible style --- ansible/roles/postgres/tasks/main.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'ansible/roles/postgres/tasks') diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 3073046..61befa5 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -1,11 +1,7 @@ - name: Install db-packages apt: - name: "{{ item }}" + name: ['postgresql', 'python-psycopg2', 'sudo'] state: present - with_items: - - postgresql - - python-psycopg2 - - sudo - name: Drop postgresql-config copy: dest: /etc/postgresql/9.6/main/postgresql.conf -- cgit v1.2.3 From 4bb5325285119407fc60034c52ce91615698f36f Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Mon, 14 Jan 2019 15:57:05 +0100 Subject: Removed dupicates --- ansible/roles/postgres/tasks/main.yml | 3 --- 1 file changed, 3 deletions(-) (limited to 'ansible/roles/postgres/tasks') diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 7aef2a6..96f5a0b 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -24,7 +24,6 @@ state: present line: "{{ whoami.stdout }} ALL=(postgres) NOPASSWD: ALL" - name: Make postgres-db - become_user: postgres postgresql_db: name: nms # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 @@ -33,7 +32,6 @@ vars: ansible_ssh_pipelining: true - name: Ensure a valid postgres-user - become_user: postgres postgresql_user: db: nms name: nms @@ -44,7 +42,6 @@ vars: ansible_ssh_pipelining: true - name: Import SQL - become_user: postgres shell: psql nms < /opt/gondul/ansible/roles/postgres/files/schema.sql # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 become: true -- cgit v1.2.3 From 5fc667a40fad97d289d45aa919a66222341ed44b Mon Sep 17 00:00:00 2001 From: Lasse Haugen Date: Mon, 14 Jan 2019 22:27:38 +0100 Subject: some ansible-lint fixes --- ansible/roles/postgres/tasks/main.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'ansible/roles/postgres/tasks') diff --git a/ansible/roles/postgres/tasks/main.yml b/ansible/roles/postgres/tasks/main.yml index 96f5a0b..902eeb9 100644 --- a/ansible/roles/postgres/tasks/main.yml +++ b/ansible/roles/postgres/tasks/main.yml @@ -1,4 +1,4 @@ -# Postgres +# Postgres # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 # - name: Install db-packages @@ -26,7 +26,6 @@ - name: Make postgres-db postgresql_db: name: nms - # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 become: true become_user: postgres vars: @@ -36,14 +35,12 @@ db: nms name: nms password: risbrod - # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 become: true become_user: postgres vars: ansible_ssh_pipelining: true - name: Import SQL shell: psql nms < /opt/gondul/ansible/roles/postgres/files/schema.sql - # https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 become: true become_user: postgres vars: -- cgit v1.2.3