diff options
| -rw-r--r-- | files/etc/apt/listchanges.conf | 2 | ||||
| -rw-r--r-- | files/etc/systemd/system/webmap-import@.service | 3 | ||||
| -rw-r--r-- | files/etc/systemd/system/webmap-raster@.service | 3 | ||||
| -rw-r--r-- | group_vars/all.yml | 2 | ||||
| -rw-r--r-- | tasks/webmap.yml | 3 | ||||
| -rw-r--r-- | templates/etc/apt/sources.list.d/debian.sources.j2 | 2 | ||||
| m--------- | webmap-tools | 0 |
7 files changed, 11 insertions, 4 deletions
diff --git a/files/etc/apt/listchanges.conf b/files/etc/apt/listchanges.conf index 96910a0..713cbbd 100644 --- a/files/etc/apt/listchanges.conf +++ b/files/etc/apt/listchanges.conf @@ -6,4 +6,4 @@ email_format=text confirm=false headers=false reverse=false -save_seen=/var/lib/apt/listchanges.db +save_seen=/var/lib/apt/listchanges diff --git a/files/etc/systemd/system/webmap-import@.service b/files/etc/systemd/system/webmap-import@.service index b6ad0f6..e2a6eb4 100644 --- a/files/etc/systemd/system/webmap-import@.service +++ b/files/etc/systemd/system/webmap-import@.service @@ -11,6 +11,9 @@ Group=_webmap Nice=15 IOSchedulingClass=idle +# Point TMPDIR to something that is not a tmpfs as we need to unpack large archives +Environment=TMPDIR=/var/tmp + Type=oneshot ExecStart=/usr/local/bin/webmap-import \ --cachedir=%C/webmap \ diff --git a/files/etc/systemd/system/webmap-raster@.service b/files/etc/systemd/system/webmap-raster@.service index 4b1819f..42a97cf 100644 --- a/files/etc/systemd/system/webmap-raster@.service +++ b/files/etc/systemd/system/webmap-raster@.service @@ -11,6 +11,9 @@ Group=_webmap Nice=15 IOSchedulingClass=idle +# Point TMPDIR to something that is not a tmpfs as we need to unpack large archives +Environment=TMPDIR=/var/tmp + Type=oneshot ExecStart=/usr/local/bin/webmap-import \ --cachedir=%C/webmap \ diff --git a/group_vars/all.yml b/group_vars/all.yml index 828f000..10dfd93 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -26,5 +26,5 @@ webmap_layer_groups_update_calendar: # PostgreSQL's version number and cluster name postgresql: - version: 15 + version: 17 cluster: main diff --git a/tasks/webmap.yml b/tasks/webmap.yml index 18b8488..2db575d 100644 --- a/tasks/webmap.yml +++ b/tasks/webmap.yml @@ -415,8 +415,7 @@ packages: - uwsgi-core - uwsgi-plugin-python3 - # TODO[trixie]: install python3-psycopg-c instead - - python3-psycopg + - python3-psycopg-c - name: Copy webmap-cgi.socket copy: src=etc/systemd/system/webmap-cgi.socket diff --git a/templates/etc/apt/sources.list.d/debian.sources.j2 b/templates/etc/apt/sources.list.d/debian.sources.j2 index 980daaf..3894b72 100644 --- a/templates/etc/apt/sources.list.d/debian.sources.j2 +++ b/templates/etc/apt/sources.list.d/debian.sources.j2 @@ -2,8 +2,10 @@ Types: deb URIs: https://deb.debian.org/debian Suites: {{ ansible_lsb.codename }} {{ ansible_lsb.codename }}-updates Components: main non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.pgp Types: deb URIs: https://deb.debian.org/debian-security Suites: {{ ansible_lsb.codename }}-security Components: main non-free-firmware +Signed-By: /usr/share/keyrings/debian-archive-keyring.pgp diff --git a/webmap-tools b/webmap-tools -Subproject 412d9fb7280f382578698ce77831f1649e75c95 +Subproject 35b84d8af9a0d03434a05e25989fe0e8b7ad190 |