Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/playbooks/saas/roles/postgresql/tasks/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- name: Set custom variables
ansible.builtin.set_fact:
image_version: "{{ latest_version }}"
image_version: "18.0"
image_name: "{{ image.name }}"
image_labels: "{{ image.labels }}"
image_build: "{{ image.build }}"
Expand Down
15 changes: 4 additions & 11 deletions ansible/playbooks/saas/roles/postgresql/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,12 @@
state: directory
owner: "{{ item.owner | default('root') }}"
group: "{{ item.group | default('root') }}"
mode: "{{ item.mode | default('0755') }}"
mode: "{{ item.mode | default('0755') }}"
loop:
- path: "{{ software_path }}/bitnami/postgresql"
- path: "{{ software_path }}/bitnami/postgresql/data"
owner: 1001
group: root
- path: "{{ software_path }}/var/backup"
owner: nobody
group: nogroup
mode: '777'
- path: "{{ software_path }}/tmp"
- path: "{{ software_path }}/var/lib/postgresql"
owner: root
group: root
mode: '1777'
delegate_to: "{{ software.instance }}"

- name: Copy script to operate software
ansible.builtin.copy:
Expand All @@ -30,6 +22,7 @@
loop:
- backup
- restore
delegate_to: "{{ software.instance }}"

- name: Copy nomad job
ansible.builtin.template:
Expand Down
13 changes: 9 additions & 4 deletions ansible/playbooks/saas/roles/postgresql/templates/nomad.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ job "{{ domain }}" {
network {
port "postgresql" {
to = 5432
{% if software.static_port is defined %}
static = {{ software.static_port }}
{% endif %}
}
}

service {
name = "{{ service_name }}-postgresql"
name = "{{ service_name }}"
port = "postgresql"
provider = "nomad"
tags = []
Expand All @@ -36,13 +39,15 @@ job "{{ domain }}" {
driver = "docker"

env {
POSTGRESQL_PASSWORD = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='passwd', missing='create', length=12) }}"
POSTGRES_PASSWORD = "{{ lookup('simple-stack-ui', type='secret', key=domain, subkey='passwd', missing='create', length=12) }}"
POSTGRES_HOST_AUTH_METHOD = "trust"
}

config {
image = "bitnami/postgresql:{{ softwares.postgresql.version }}"
image = "postgres:{{ softwares.postgresql.version }}"
ports = ["postgresql"]
volumes = [
"{{ software_path }}/bitnami/postgresql:/bitnami/postgresql:rw",
"{{ software_path }}/var/lib/postgresql:/var/lib/postgresql:rw",
"{{ software_path }}/tmp:/tmp:rw"
]
}
Expand Down
2 changes: 0 additions & 2 deletions ansible/playbooks/saas/roles/postgresql/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,3 @@ image:
os: linux
labels: {}
name: postgresql

latest_version: "17.4.0"