Skip to content

Commit 1e6a7d0

Browse files
hunleydhunleyd
committed
Merge remote-tracking branch 'origin/develop' into INDATA-152
* origin/develop: fix(nix): remove '%' character from Nix trusted-public-keys configuration (#1840) chore: systemd hardening (#1837) Revert "refactor(postgresq): switch to 'include_dir' and then rename conf files to ensure ordering" (#1835) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1821) fix(pgmq): replace drop_queue function if exists (#1828) refactor(postgresq): switch to 'include_dir' and then renames conf files to ensure ordering (#1820) feat: support multiple versions of the pg_jsonschema extension (#1757) feat: bump auth to v2.180.0 (#1829) feat: update supautils confs w/ new tables feat(migrations): predefined role grants (#1815) feat: run pg_regress tests after installing the last version of the extension (#1826) fix(pgmq): add missing helper function in migration script (#1825) feat: support multiple versions of the pgmq extension (#1668) feat: run pg_regress during extension tests (#1812) feat: support multiple versions of the pgrouting extension (#1687) refactor(ansible): bring our ansible up to modern ansible-lint standards (#1819) feat: support multiple versions of the pg-graphql extension (#1761)
2 parents d4092d8 + da08e35 commit 1e6a7d0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+21159
-381
lines changed

‎.github/workflows/ami-release-nix-single.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
4747
extra_nix_config: |
4848
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
49-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
49+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
5050
5151
- name: Set PostgreSQL version environment variable
5252
run: |

‎.github/workflows/ami-release-nix.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
3131
extra_nix_config: |
3232
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
33-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
33+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
3434
3535
- name: Set PostgreSQL versions
3636
id: set-versions
@@ -65,7 +65,7 @@ jobs:
6565
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
6666
extra_nix_config: |
6767
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
68-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
68+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
6969
7070
- name: Run checks if triggered manually
7171
if: ${{ github.event_name == 'workflow_dispatch' }}

‎.github/workflows/nix-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
7474
extra_nix_config: |
7575
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
76-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
76+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
7777
post-build-hook = /etc/nix/upload-to-cache.sh
7878
- name: Install nix
7979
uses: cachix/install-nix-action@v27
@@ -82,7 +82,7 @@ jobs:
8282
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
8383
extra_nix_config: |
8484
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
85-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
85+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
8686
- name: Aggressive disk cleanup for DuckDB build
8787
if: matrix.runner == 'macos-latest-xlarge'
8888
run: |

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
extra-conf: |
2121
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
22-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
22+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
2323
- name: Set PostgreSQL versions
2424
id: set-versions
2525
run: |
@@ -47,7 +47,7 @@ jobs:
4747
with:
4848
extra-conf: |
4949
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
50-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
50+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
5151
- name: Set PostgreSQL version environment variable
5252
run: echo "POSTGRES_MAJOR_VERSION=${{ matrix.postgres_version }}" >> $GITHUB_ENV
5353
- name: Strip quotes from pg major and set env var

‎.github/workflows/testinfra-ami-build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
2828
extra_nix_config: |
2929
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
30-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
30+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
3131
3232
- name: Set PostgreSQL versions
3333
id: set-versions
@@ -77,7 +77,7 @@ jobs:
7777
install_url: https://releases.nixos.org/nix/nix-2.29.1/install
7878
extra_nix_config: |
7979
substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com
80-
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
80+
trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
8181
8282
8383
- id: args

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ common-nix.vars.pkr.hcl
3030

3131
# pre-commit config is managed in nix
3232
.pre-commit-config.yaml
33-
nixos.qcow2
33+
nixos.qcow2

‎Dockerfile-15‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/
5656
--init none \
5757
--no-confirm \
5858
--extra-conf "substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com" \
59-
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
59+
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
6060

6161
ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
6262

‎Dockerfile-17‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/
5858
--init none \
5959
--no-confirm \
6060
--extra-conf "substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com" \
61-
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
61+
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
6262

6363
ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
6464

‎Dockerfile-orioledb-17‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/
5858
--init none \
5959
--no-confirm \
6060
--extra-conf "substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com" \
61-
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
61+
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
6262

6363
ENV PATH="${PATH}:/nix/var/nix/profiles/default/bin"
6464

‎ansible/files/admin_api_scripts/pg_upgrade_scripts/initiate.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,13 @@ function initiate_upgrade {
286286
chmod +x "$NIX_INSTALLER_PATH"
287287
"$NIX_INSTALLER_PATH" install --no-confirm \
288288
--extra-conf "substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com" \
289-
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
289+
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
290290
else
291291
echo "1.1.1. Installing Nix using the official installer"
292292

293293
curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | sh -s -- install --no-confirm \
294294
--extra-conf "substituters = https://cache.nixos.org https://nix-postgres-artifacts.s3.amazonaws.com" \
295-
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI=% cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
295+
--extra-conf "trusted-public-keys = nix-postgres-artifacts:dGZlQOvKcNEjvT7QEAJbcV6b6uk7VF/hWMjhYleiaLI= cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
296296
fi
297297
else
298298
echo "1.1. Nix is installed; moving on."

0 commit comments

Comments
 (0)