Merge branch 'develop' into sam/oriole17

Author: samrose

ansible/tasks/stage2-setup-postgres.yml

@@ -32,6 +32,7 @@
           /etc/postgresql/postgresql.conf
       when: is_psql_oriole and stage2_nix
       become: yes
+
 - name: Install Git for Nix package management
   become: yes
   apt:
@@ -40,7 +41,6 @@
     update_cache: yes
   when: stage2_nix
 
-
 - name: Install Postgres from nix binary cache
   become: yes
   shell: |