Skip to content

Commit 6a87d00

Browse files
authored
Merge pull request #16 from supabase/develop
supabase/postgres v0.12.0
2 parents e3de28b + 86878e8 commit 6a87d00

16 files changed

+90
-169
lines changed

amazon.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@
33
"aws_access_key": "",
44
"aws_secret_key": "",
55
"region": "",
6+
"ami": "",
67
"name": ""
78
},
89
"builders": [{
910
"type": "amazon-ebs",
1011
"access_key": "{{user `aws_access_key`}}",
1112
"secret_key": "{{user `aws_secret_key`}}",
1213
"region": "{{user `region`}}",
13-
"source_ami": "ami-0f7719e8b7ba25c61",
14-
"instance_type": "t2.micro",
14+
"source_ami": "{{user `ami`}}",
15+
"instance_type": "t2.large",
1516
"ssh_username": "ubuntu",
1617
"ami_name": "{{user `name`}}",
1718
"launch_block_device_mappings": [{
1819
"device_name": "/dev/sda1",
19-
"encrypted": true,
20-
"kms_key_id": "44e7e739-21f1-4678-829e-d1ac63d121b4",
2120
"iops": 400,
2221
"volume_type": "io1",
2322
"volume_size": 8,
@@ -35,6 +34,7 @@
3534
"type": "shell",
3635
"scripts": [
3736
"scripts/01-test",
37+
"scripts/02-credentials_cleanup.sh",
3838
"scripts/90-cleanup.sh",
3939
"scripts/91-log_cleanup.sh",
4040
"scripts/99-img_check.sh"

ansible/files/ACCC4CF8.asc

Lines changed: 0 additions & 77 deletions
This file was deleted.

ansible/files/apt_periodic

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
APT::Periodic::Update-Package-Lists "1";
2+
APT::Periodic::Download-Upgradeable-Packages "1";
3+
APT::Periodic::AutocleanInterval "7";
4+
APT::Periodic::Unattended-Upgrade "1";

ansible/files/kong.conf.j2

Lines changed: 0 additions & 7 deletions
This file was deleted.

ansible/files/kong.service.j2

Lines changed: 0 additions & 20 deletions
This file was deleted.

ansible/files/postgresql.service.j2

Lines changed: 0 additions & 5 deletions
This file was deleted.

ansible/files/postgrest.service.j2

Lines changed: 0 additions & 17 deletions
This file was deleted.

ansible/files/supabase.service.j2

Lines changed: 0 additions & 24 deletions
This file was deleted.

ansible/playbook.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@
2929
file:
3030
path: /tmp/00-schema.sql
3131
state: absent
32-
33-
- name: Set up password for superadmin postgres
34-
become: yes
35-
become_user: postgres
36-
postgresql_user:
37-
name: postgres
38-
password: "{{ postgres_superadmin_password }}"
3932

33+
- name: Adjust APT update intervals
34+
copy:
35+
src: files/apt_periodic
36+
dest: /etc/apt/apt.conf.d/10periodic
37+
4038
- name: UFW - Allow SSH connections
4139
ufw:
4240
rule: allow

ansible/tasks/setup-extensions.yml

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,44 @@
4343
update_cache: yes
4444
cache_valid_time: 3600
4545

46+
- name: pgAudit - download & install dependencies
47+
apt:
48+
pkg:
49+
- postgresql-server-dev-12
50+
- libssl-dev
51+
- libkrb5-dev
52+
update_cache: yes
53+
install_recommends: no
54+
55+
- name: pgAudit - download latest release
56+
git:
57+
repo: https://github.com/pgaudit/pgaudit.git
58+
dest: /tmp/pgaudit
59+
become: yes
60+
61+
- name: pgAudit - build
62+
make:
63+
chdir: /tmp/pgaudit
64+
target: check
65+
params:
66+
USE_PGXS: 1
67+
become: yes
68+
69+
- name: pgAudit - install
70+
make:
71+
chdir: /tmp/pgaudit
72+
target: install
73+
params:
74+
USE_PGXS: 1
75+
become: yes
76+
4677
- name: plv8 - download & install dependencies
4778
apt:
4879
pkg:
4980
- build-essential
5081
- ca-certificates
5182
- curl
5283
- git-core
53-
- python
5484
- gpp
5585
- cpp
5686
- pkg-config

0 commit comments

Comments
 (0)