feat: make pg_prove an nix installable package in our set

Author: samrose

ansible/playbook.yml

@@ -71,46 +71,11 @@
       tags:
         - install-supabase-internal
 
-    # - name: Start Postgres Database
-    #   systemd:
-    #     name: postgresql
-    #     state: started
-    #   when: not ebssurrogate_mode
-
-    # - name: Start Postgres Database without Systemd
-    #   become: yes
-    #   become_user: postgres
-    #   shell:
-    #     cmd: /usr/lib/postgresql/bin/pg_ctl -D /var/lib/postgresql/data start
-    #   when: ebssurrogate_mode
-    # TODO bring into 2nd phase 
-
     - name: Adjust APT update intervals
       copy:
         src: files/apt_periodic
         dest: /etc/apt/apt.conf.d/10periodic
 
-    # - name: Transfer init SQL files
-    #   copy:
-    #     src: files/{{ item.source }}
-    #     dest: /tmp/{{ item.dest }}
-    #   loop: "{{ sql_files }}"
-
-    # - name: Execute init SQL files
-    #   become: yes
-    #   become_user: postgres
-    #   shell:
-    #     cmd: /usr/lib/postgresql/bin/psql -f /tmp/{{ item.dest }}
-    #   loop: "{{ sql_files }}"
-
-    # - name: Delete SQL scripts
-    #   file:
-    #     path: /tmp/{{ item.dest }}
-    #     state: absent
-    #   loop: "{{ sql_files }}"
-    # TODO bring into 2nd phase
-
-
     - name: First boot optimizations
       import_tasks: tasks/internal/optimizations.yml
       tags:
@@ -143,32 +108,8 @@
         update_cache: yes
         cache_valid_time: 3600
 
-    # - name: Clean out build dependencies
-    #   import_tasks: tasks/clean-build-dependencies.yml
-
-    # - name: Restart Postgres Database without Systemd
-    #   become: yes
-    #   become_user: postgres
-    #   shell:
-    #     cmd: /usr/lib/postgresql/bin/pg_ctl -D /var/lib/postgresql/data restart -o "-c shared_preload_libraries='pg_tle'"
-    #   when: ebssurrogate_mode
-
-    # - name: Run migrations
-    #   import_tasks: tasks/setup-migrations.yml
-    #   tags:
-    #     - migrations
-
-    # - name: Stop Postgres Database without Systemd
-    #   become: yes
-    #   become_user: postgres
-    #   shell:
-    #     cmd: /usr/lib/postgresql/bin/pg_ctl -D /var/lib/postgresql/data stop
-    #   when: ebssurrogate_mode
-
-    # - name: Run unit tests
-    #   import_tasks: tasks/test-image.yml
-    #   tags:
-    #     - unit-tests
+    - name: Clean out build dependencies
+      import_tasks: tasks/clean-build-dependencies.yml
 
     # - name: Collect Postgres binaries
     #   import_tasks: tasks/internal/collect-pg-binaries.yml

ansible/tasks/internal/collect-pg-binaries.yml

@@ -80,7 +80,7 @@
 - name: Install hypopg
   import_tasks: tasks/postgres-extensions/26-hypopg.yml
 
- - name: Install pg_repack
+- name: Install pg_repack
   import_tasks: tasks/postgres-extensions/27-pg_repack.yml
 
 - name: Install pgvector

ansible/tasks/setup-extensions.yml

@@ -74,24 +74,26 @@
     - "/home/postgres/.nix-profile/share/postgresql/extension/*"
   become: yes
 
+- name: Recursively create destination directory
+  file:
+    path: /usr/lib/postgresql/share/postgresql/contrib/
+    state: directory
+    recurse: yes
 
-# - name: Create directories recursively
-#   file:
-#     path: "/usr/lib/postgresql/share/postgresql/contrib/{{ item | dirname }}"
-#     state: directory
-#   with_fileglob:
-#     - "/home/postgres/.nix-profile/share/postgresql/contrib/*"
-
-# - name: Create symbolic links for files
-#   file:
-#     src: "{{ item }}"
-#     dest: "/usr/lib/postgresql/share/postgresql/contrib/{{ item | regex_replace('^/home/postgres/.nix-profile/share/postgresql/contrib/', '') }}"
-#     state: link
-#   with_find:
-#     paths: "/home/postgres/.nix-profile/share/postgresql/contrib/"
-#     recurse: yes
-#     patterns: "*"
-#     file_type: any
+- name: Create symbolic link for each directory
+  file:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    state: link
+  loop:
+    - { src: "/home/postgres/.nix-profile/share/postgresql/contrib/", dest: "/usr/lib/postgresql/share/postgresql/contrib/" }
+
+- name: Create symbolic link for each file
+  file:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    state: link
+  loop: "{{ query('fileglob', '/home/postgres/.nix-profile/share/postgresql/contrib/*') }}"
 
 - name: Create symbolic links from /home/postgres/.nix-profile/share/postgresql/timezonesets to /usr/lib/postgresql/share/postgresql/timeszonesets
   file:
@@ -115,7 +117,7 @@
 # Install extensions before init
 # - name: Install Postgres extensions
 #   import_tasks: tasks/setup-docker.yml
-# TODO resolve in new build
+# TODO resolve in this stage
 
 - name: Link database data_dir to data volume directory
   file:
@@ -146,9 +148,46 @@
     src: /tmp/ansible-playbook/files/database-optimizations.service.j2
     dest: /etc/systemd/system/database-optimizations.service
 
+# - name: Transfer init SQL files
+#   copy:
+#     src: files/{{ item.source }}
+#     dest: /tmp/{{ item.dest }}
+#   loop: "{{ sql_files }}"
+# probably do not need this step
+
+- name: Execute init SQL files
+  become: yes
+  become_user: postgres
+  shell:
+    cmd: /usr/lib/postgresql/bin/psql -f /tmp/ansible-playbook/files/{{ item.dest }}
+  loop: "{{ sql_files }}"
+
+- name: Delete SQL scripts
+  file:
+    path: /tmp/{{ item.dest }}
+    state: absent
+  loop: "{{ sql_files }}"
+
 # # # Reload
 - name: System - systemd reload
   systemd:
     enabled: yes
     name: postgresql
     daemon_reload: yes
+
+
+- name: Run migrations
+  import_tasks: tasks/setup-migrations.yml
+  tags:
+    - migrations
+
+- name: Stop Postgres with systemd
+  systemd:
+    state: stopped
+    name: postgresql
+
+
+- name: Run unit tests
+  import_tasks: tasks/test-image.yml
+  tags:
+    - unit-tests

ansible/tasks/stage2/stage2-setup-postgres.yml

@@ -137,7 +137,6 @@
 
         #this var is a convenience setting to import the orioledb patched version of postgresql
         postgresql_orioledb_16 = oriole_pkgs.postgresql_orioledb_16;
-        #postgis_override = pkgs.postgis_override;
 
         # Create a 'receipt' file for a given postgresql package. This is a way
         # of adding a bit of metadata to the package, which can be used by other
@@ -399,7 +398,7 @@
           psql_15 = makePostgres "15";
           #psql_16 = makePostgres "16";
           #psql_orioledb_16 = makeOrioleDbPostgres "16_23" postgresql_orioledb_16;
-
+          pg_prove = pg_prove;
           # Start a version of the server.
           start-server =
             let

flake.nix

@@ -79,7 +79,7 @@ stdenv.mkDerivation rec {
     homepage = "https://postgis.net/";
     changelog = "https://git.osgeo.org/gitea/postgis/postgis/raw/tag/${version}/NEWS";
     license = licenses.gpl2;
-    maintainers = with maintainers; teams.geospatial.members ++ [ marcweber wolfgangwalther ];
+    maintainers = with maintainers; [ samrose ];
     inherit (postgresql.meta) platforms;
   };
 }