Merge pull request supabase#28 from supabase/updates-and-fixes

Updates and fixes

Author: dragarcia

README.md

@@ -5,7 +5,7 @@ Unmodified Postgres with some useful plugins. Our goal with this repo is not to
 ## Features
 
 - ✅ Postgres [12](https://www.postgresql.org/about/news/1976/). Includes [generated columns](https://www.postgresql.org/docs/12/ddl-generated-columns.html) and [JSON path](https://www.postgresql.org/docs/12/functions-json.html#FUNCTIONS-SQLJSON-PATH) support.
-- ✅ Ubuntu 18.04 (Bionic). 
+- ✅ Ubuntu 18.04 (Bionic).
 - ✅ [pg-contrib-12](https://www.postgresql.org/docs/12/contrib.html). Because everyone should enable `pg_stat_statements`.
 - ✅ [wal_level](https://www.postgresql.org/docs/current/runtime-config-wal.html) = logical and [max_replication_slots](https://www.postgresql.org/docs/current/runtime-config-replication.html) = 5. Ready for replication.
 - ✅ [PostGIS](https://postgis.net/). Postgres' most popular extension - support for geographic objects.
@@ -28,11 +28,11 @@ See all installation instructions in the [repo wiki](https://github.com/supabase
 
 ## Motivation
 
-After talking to a lot of techies, we've found that most believe Postgres is the best (operational) database but they *still* choose other databases. This is overwhelmingly because "the other one was quicker/easier". Our goal is to make it fast and simple to get started with Postgres, so that we never hear that excuse again. 
+After talking to a lot of techies, we've found that most believe Postgres is the best (operational) database but they _still_ choose other databases. This is overwhelmingly because "the other one was quicker/easier". Our goal is to make it fast and simple to get started with Postgres, so that we never hear that excuse again.
 
 Our secondary goal is to show off a few of Postgres' most exciting features. This is to convince new developers to choose it over other database (a decision we hope they'll appreciate once they start scaling).
 
-Finally, this is the same build we offer at [Supabase](https://supabase.io), and everything we do is opensource. This repo makes it easy to *install* Postgres, Supabase makes it easy to *use* Postgres.
+Finally, this is the same build we offer at [Supabase](https://supabase.io), and everything we do is opensource. This repo makes it easy to _install_ Postgres, Supabase makes it easy to _use_ Postgres.
 
 ## Roadmap
 
@@ -50,4 +50,3 @@ We are building the features of Firebase using enterprise-grade, open source pro
 
 [![Worklife VC](https://user-images.githubusercontent.com/10214025/90451355-34d71200-e11e-11ea-81f9-1592fd1e9146.png)](https://www.worklife.vc)
 [![New Sponsor](https://user-images.githubusercontent.com/10214025/90518111-e74bbb00-e198-11ea-8f88-c9e3c1aa4b5b.png)](https://github.com/sponsors/supabase)
-

amazon-arm.json

@@ -0,0 +1,61 @@
+{
+  "variables": {
+    "aws_access_key": "",
+    "aws_secret_key": "",
+    "region": "ap-northeast-1",
+    "ami_regions": "ap-northeast-1",
+    "ami": "ami-034efdc866e4b4fd7",
+    "ami_name": "supabase-postgres-0.14.0",
+    "environment": "testing",
+    "ansible_arguments": "--skip-tags,update-only -v"
+  },
+  "builders": [
+    {
+      "type": "amazon-ebs",
+      "access_key": "{{user `aws_access_key`}}",
+      "secret_key": "{{user `aws_secret_key`}}",
+      "region": "{{user `region`}}",
+      "ami_regions": "{{user `ami_regions`}}",
+      "source_ami": "{{user `ami`}}",
+      "instance_type": "c6g.2xlarge",
+      "ssh_username": "ubuntu",
+      "ami_name": "{{user `ami_name`}}",
+      "tags": {
+        "environment": "{{user `environment`}}",
+        "appType": "postgres"
+      },
+      "launch_block_device_mappings": [
+        {
+          "device_name": "/dev/sda1",
+          "volume_size": 16,
+          "volume_type": "gp2",
+          "delete_on_termination": true
+        }
+      ]
+    }
+  ],
+  "provisioners": [
+    {
+      "type": "shell",
+      "inline": [
+        "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for cloud-init...'; sleep 1; done"
+      ]
+    },
+    {
+      "type": "ansible",
+      "user": "ubuntu",
+      "playbook_file": "ansible/playbook.yml",
+      "extra_arguments": "{{user `ansible_arguments`}}"
+    },
+    {
+      "execute_command": "echo 'packer' | sudo -S sh -c '{{ .Vars }} {{ .Path }}'",
+      "type": "shell",
+      "scripts": [
+        "scripts/01-test",
+        "scripts/02-credentials_cleanup.sh",
+        "scripts/90-cleanup.sh",
+        "scripts/91-log_cleanup.sh"
+      ]
+    }
+  ]
+}

amazon.json

@@ -5,33 +5,42 @@
     "region": "ap-southeast-1",
     "ami_regions": "ap-southeast-1",
     "ami": "ami-0f7719e8b7ba25c61",
+    "ami_name": "supabase-postgres-0.14.0",
     "environment": "testing",
     "ansible_arguments": "--skip-tags,update-only"
   },
-  "builders": [{
-    "type": "amazon-ebs",
-    "access_key": "{{user `aws_access_key`}}",
-    "secret_key": "{{user `aws_secret_key`}}",
-    "region": "{{user `region`}}",
-    "ami_regions": "{{user `ami_regions`}}",
-    "source_ami": "{{user `ami`}}",
-    "instance_type": "m5.2xlarge",
-    "ssh_username": "ubuntu",
-    "ami_name": "supabase-postgres-0.13.0",
-    "tags":{
-      "environment":"{{user `environment`}}",
-      "appType":"postgres"
-    },
-    "launch_block_device_mappings": [
-      {
-        "device_name": "/dev/sda1",
-        "volume_size": 16,
-        "volume_type": "gp2",
-        "delete_on_termination": true
-      }
-    ]
-  }],
+  "builders": [
+    {
+      "type": "amazon-ebs",
+      "access_key": "{{user `aws_access_key`}}",
+      "secret_key": "{{user `aws_secret_key`}}",
+      "region": "{{user `region`}}",
+      "ami_regions": "{{user `ami_regions`}}",
+      "source_ami": "{{user `ami`}}",
+      "instance_type": "m5.2xlarge",
+      "ssh_username": "ubuntu",
+      "ami_name": "{{user `ami_name`}}",
+      "tags": {
+        "environment": "{{user `environment`}}",
+        "appType": "postgres"
+      },
+      "launch_block_device_mappings": [
+        {
+          "device_name": "/dev/sda1",
+          "volume_size": 16,
+          "volume_type": "gp2",
+          "delete_on_termination": true
+        }
+      ]
+    }
+  ],
   "provisioners": [
+    {
+      "type": "shell",
+      "inline": [
+        "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for cloud-init...'; sleep 1; done"
+      ]
+    },
     {
       "type": "ansible",
       "user": "ubuntu",
@@ -42,11 +51,9 @@
       "execute_command": "echo 'packer' | sudo -S sh -c '{{ .Vars }} {{ .Path }}'",
       "type": "shell",
       "scripts": [
-        "scripts/01-test",
         "scripts/02-credentials_cleanup.sh",
         "scripts/90-cleanup.sh",
-        "scripts/91-log_cleanup.sh",
-        "scripts/99-img_check.sh"
+        "scripts/91-log_cleanup.sh"
       ]
     }
   ]

ansible/install_roles.yml

@@ -1,5 +1,4 @@
 ---
-
 - name: anxs.postgresql
   src: https://github.com/anxs/postgresql
-  version: v1.12.0
+  version: v1.12.0

ansible/playbook.yml

@@ -3,10 +3,10 @@
 
   pre_tasks:
     - import_tasks: tasks/setup-system.yml
-  
+
   vars_files:
     - ./vars.yml
-  
+
   roles:
     - role: anxs.postgresql
 
@@ -18,7 +18,7 @@
       import_tasks: tasks/setup-extensions.yml
 
     - name: Adjust APT update intervals
-      copy: 
+      copy:
         src: files/apt_periodic
         dest: /etc/apt/apt.conf.d/10periodic
 
@@ -30,10 +30,10 @@
     - name: UFW - Allow connections to postgreSQL (5432)
       ufw:
         rule: allow
-        port: '5432'
+        port: "5432"
 
     - name: UFW - Deny all other incoming traffix by default
-      ufw: 
+      ufw:
         state: enabled
         policy: deny
-        direction: incoming
+        direction: incoming

ansible/tasks/setup-extensions.yml

@@ -2,19 +2,19 @@
 - name: Install postgis for postgreSQL versions < 10
   apt:
     pkg:
-    - libgeos-c1v5
-    - "postgresql-{{ postgresql_version }}-postgis-{{ postgresql_ext_postgis_version }}"
-    - "postgresql-{{ postgresql_version }}-postgis-scripts"
+      - libgeos-c1v5
+      - "postgresql-{{ postgresql_version }}-postgis-{{ postgresql_ext_postgis_version }}"
+      - "postgresql-{{ postgresql_version }}-postgis-scripts"
     update_cache: yes
     cache_valid_time: 3600
   when: postgresql_version < 10
 
 - name: Install postgis for postgreSQL versions >= 10
   apt:
     pkg:
-    - libgeos-c1v5
-    - "postgresql-{{ postgresql_version }}-postgis-{{ postgresql_ext_postgis_version }}"
-    - "postgresql-{{ postgresql_version }}-postgis-{{ postgresql_ext_postgis_version }}-scripts"
+      - libgeos-c1v5
+      - "postgresql-{{ postgresql_version }}-postgis-{{ postgresql_ext_postgis_version }}"
+      - "postgresql-{{ postgresql_version }}-postgis-{{ postgresql_ext_postgis_version }}-scripts"
     update_cache: yes
     cache_valid_time: 3600
   when: postgresql_version >= 10
@@ -46,6 +46,13 @@
     update_cache: yes
     cache_valid_time: 3600
 
+# pgcron
+- name: Install pgcron
+  apt:
+    pkg: postgresql-12-cron
+    update_cache: yes
+    cache_valid_time: 3600
+
 # pgAudit
 - name: pgAudit - download & install dependencies
   apt:
@@ -70,7 +77,7 @@
   become: yes
 
 - name: pgAudit - build
-  make: 
+  make:
     chdir: /tmp/pgaudit-{{ pgaudit_release }}
     target: check
     params:
@@ -100,7 +107,7 @@
 
 - name: Remove libcurl4 package
   apt:
-    pkg: 
+    pkg:
       - libcurl4
     state: absent
 
@@ -126,7 +133,7 @@
   become: yes
 
 - name: pgsql-http - build
-  make: 
+  make:
     chdir: /tmp/pgsql-http-{{ pgsql_http_release }}
   become: yes
 
@@ -158,7 +165,7 @@
   become: yes
 
 - name: plpgsql_check - clean
-  make: 
+  make:
     chdir: /tmp/plpgsql_check-{{ plpgsql_check_release }}
     target: clean
   become: yes
@@ -188,20 +195,20 @@
 - name: pljava - unpack archive
   unarchive:
     remote_src: yes
-    src: /tmp/pljava-{{ pljava_release }}.tar.gz 
+    src: /tmp/pljava-{{ pljava_release }}.tar.gz
     dest: /tmp
   become: yes
 
 - name: pljava - build
   become: yes
-  shell:  
+  shell:
     cmd: mvn clean install
     chdir: /tmp/pljava-{{ pljava_release }}
 
 - name: pljava - install
   become: yes
-  shell:  
-    cmd: java -jar pljava-packaging/target/pljava-pg12.3-amd64-Linux-gpp.jar
+  shell:
+    cmd: java -jar pljava-packaging/target/pljava-pg12.jar
     chdir: /tmp/pljava-{{ pljava_release }}
 
 - name: pljava - remove build dependencies
@@ -221,15 +228,14 @@
 
 - name: pljava - set pljava.libjvm_location
   become: yes
-  shell:  
+  shell:
     cmd: echo "pljava.libjvm_location = '/usr/lib/jvm/java-11-openjdk-amd64/lib/server/libjvm.so'" >> /etc/postgresql/12/main/postgresql.conf
 
 - name: pljava - remove ~/.m2 directory
   become: yes
   file:
     path: ~/.m2
     state: absent
-
 # plv8
 - name: plv8 - download & install dependencies
   apt:
@@ -249,6 +255,7 @@
       - libc++1
       - libtinfo5
       - libc++abi1
+      - ninja-build
     update_cache: yes
     install_recommends: no
 
@@ -260,7 +267,7 @@
   become: yes
 
 - name: plv8 - build
-  make: 
+  make:
     chdir: /tmp/plv8
   become: yes