Rename "webmap" to the less generic "geodata".

The database has uses beyond the webmap.
Cf. ca91a579770c89d25aefae220079bf336fa88dc9 in tools.

8 files changed, 49 insertions, 49 deletions

diff --git a/files/etc/systemd/system/webmap-download@.service b/files/etc/systemd/system/geodata-download@.service
index d7a49dc..2a8c940 100644
--- a/files/etc/systemd/system/webmap-download@.service
+++ b/files/etc/systemd/system/geodata-download@.service
@@ -1,22 +1,22 @@
 [Unit]
-Description=Webmap updater service (download ‘%I’)
+Description=Geodata updater service (download ‘%I’)
 # Chaining logic from https://serverfault.com/questions/1079993/why-does-my-systemd-timer-only-trigger-once-when-the-unit-is-a-target#answer-1128671
 # XXX Looks like Upholds= prevents running a single unit, as it causes
-# webmap-update@%i.target to start upon `systemctl start webmap-download@foo.service`
-After=network-online.target webmap-update@%i.target
-Upholds=webmap-update@%i.target
+# geodata-update@%i.target to start upon `systemctl start geodata-download@foo.service`
+After=network-online.target geodata-update@%i.target
+Upholds=geodata-update@%i.target
 
 [Service]
-User=_webmap-download
-Group=_webmap
+User=_geodata-download
+Group=_geodata
 
 Nice=15
 IOSchedulingClass=idle
 
 Type=oneshot
-ExecStart=/usr/local/bin/webmap-download \
-    --cachedir=%C/webmap \
-    --lockdir=%t/lock/webmap/cache \
+ExecStart=/usr/local/bin/geodata-download \
+    --cachedir=%C/geodata \
+    --lockdir=%t/lock/geodata/cache \
     --no-exit-code \
     --quiet \
     -- %I
@@ -30,8 +30,8 @@ ProtectControlGroups=yes
 ProtectKernelModules=yes
 ProtectKernelTunables=yes
 RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
-ReadWritePaths=%C/webmap
-ReadWritePaths=%t/lock/webmap/cache
+ReadWritePaths=%C/geodata
+ReadWritePaths=%t/lock/geodata/cache
 
 [Install]
-WantedBy=webmap-update@%i.target
+WantedBy=geodata-update@%i.target
diff --git a/files/etc/systemd/system/webmap-import@.service b/files/etc/systemd/system/geodata-import@.service
index e2a6eb4..7d652ea 100644
--- a/files/etc/systemd/system/webmap-import@.service
+++ b/files/etc/systemd/system/geodata-import@.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=Webmap updater service (import ‘%I’ to PostGIS)
-After=postgresql.service webmap-update@%i.target
-After=webmap-download@%i.service
-Upholds=webmap-update@%i.target
+Description=Geodata updater service (import ‘%I’ to PostGIS)
+After=postgresql.service geodata-update@%i.target
+After=geodata-download@%i.service
+Upholds=geodata-update@%i.target
 
 [Service]
-User=_webmap
-Group=_webmap
+User=_geodata
+Group=_geodata
 
 Nice=15
 IOSchedulingClass=idle
@@ -15,10 +15,10 @@ IOSchedulingClass=idle
 Environment=TMPDIR=/var/tmp
 
 Type=oneshot
-ExecStart=/usr/local/bin/webmap-import \
-    --cachedir=%C/webmap \
-    --lockfile=%t/lock/webmap/lock \
-    --lockdir-sources=%t/lock/webmap/cache \
+ExecStart=/usr/local/bin/geodata-import \
+    --cachedir=%C/geodata \
+    --lockfile=%t/lock/geodata/lock \
+    --lockdir-sources=%t/lock/geodata/cache \
     --mvtdir=/var/www/webmap/tiles/%I \
     --mvt-compress \
     --metadata-compress \
@@ -33,9 +33,9 @@ ProtectControlGroups=yes
 ProtectKernelModules=yes
 ProtectKernelTunables=yes
 RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6
-ReadWritePaths=%t/lock/webmap
+ReadWritePaths=%t/lock/geodata
 ReadWritePaths=/var/www/webmap/tiles
 PrivateTmp=yes
 
 [Install]
-WantedBy=webmap-update@%i.target
+WantedBy=geodata-update@%i.target
diff --git a/files/etc/systemd/system/webmap-raster@.service b/files/etc/systemd/system/geodata-raster@.service
index 42a97cf..aed7930 100644
--- a/files/etc/systemd/system/webmap-raster@.service
+++ b/files/etc/systemd/system/geodata-raster@.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=Webmap updater service (export ‘%I’ to COG)
-After=webmap-update@%i.target
-After=webmap-download@%i.service
-Upholds=webmap-update@%i.target
+Description=Geodata updater service (export ‘%I’ to COG)
+After=geodata-update@%i.target
+After=geodata-download@%i.service
+Upholds=geodata-update@%i.target
 
 [Service]
-User=_webmap
-Group=_webmap
+User=_geodata
+Group=_geodata
 
 Nice=15
 IOSchedulingClass=idle
@@ -15,10 +15,10 @@ IOSchedulingClass=idle
 Environment=TMPDIR=/var/tmp
 
 Type=oneshot
-ExecStart=/usr/local/bin/webmap-import \
-    --cachedir=%C/webmap \
-    --lockfile=%t/lock/webmap/lock \
-    --lockdir-sources=%t/lock/webmap/cache \
+ExecStart=/usr/local/bin/geodata-import \
+    --cachedir=%C/geodata \
+    --lockfile=%t/lock/geodata/lock \
+    --lockdir-sources=%t/lock/geodata/cache \
     --rasterdir=/var/www/webmap/raster/%I \
     --metadata-compress \
     -- %I
@@ -32,9 +32,9 @@ ProtectControlGroups=yes
 ProtectKernelModules=yes
 ProtectKernelTunables=yes
 RestrictAddressFamilies=AF_UNIX
-ReadWritePaths=%t/lock/webmap
+ReadWritePaths=%t/lock/geodata
 ReadWritePaths=/var/www/webmap/raster
 PrivateTmp=yes
 
 [Install]
-WantedBy=webmap-update@%i.target
+WantedBy=geodata-update@%i.target
diff --git a/files/etc/systemd/system/geodata-update@.target b/files/etc/systemd/system/geodata-update@.target
new file mode 100644
index 0000000..e7cdecb
--- /dev/null
+++ b/files/etc/systemd/system/geodata-update@.target
@@ -0,0 +1,3 @@
+[Unit]
+Description=Geodata updater (target unit ‘%I’)
+StopWhenUnneeded=true
diff --git a/files/etc/systemd/system/webmap-update@.timer b/files/etc/systemd/system/geodata-update@.timer
index 74fb848..90fd865 100644
--- a/files/etc/systemd/system/webmap-update@.timer
+++ b/files/etc/systemd/system/geodata-update@.timer
@@ -1,11 +1,11 @@
 [Unit]
-Description=Webmap updater (timer unit)
+Description=Geodata updater (timer unit)
 
 [Timer]
 OnCalendar=*-*-* 01:00:00
 AccuracySec=1s
 RandomizedDelaySec=3599
-Unit=webmap-update@%i.target
+Unit=geodata-update@%i.target
 
 [Install]
 WantedBy=timers.target
diff --git a/files/etc/systemd/system/webmap-update@.target b/files/etc/systemd/system/webmap-update@.target
deleted file mode 100644
index 840de96..0000000
--- a/files/etc/systemd/system/webmap-update@.target
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-Description=Webmap updater (target unit ‘%I’)
-StopWhenUnneeded=true
diff --git a/files/etc/tmpfiles.d/geodata.conf b/files/etc/tmpfiles.d/geodata.conf
new file mode 100644
index 0000000..a299e0f
--- /dev/null
+++ b/files/etc/tmpfiles.d/geodata.conf
@@ -0,0 +1,8 @@
+d %t/lock/geodata           00755 root root
+
+# for `geodata-download --lockdir` *and* `geodata-import --lockdir-sources`
+# (hence the set-group-ID bit and g+w)
+d %t/lock/geodata/cache     02775 _geodata-download _geodata
+
+# for `geodata-import --lockfile`
+f %t/lock/geodata/lock      00644 _geodata _geodata
diff --git a/files/etc/tmpfiles.d/webmap.conf b/files/etc/tmpfiles.d/webmap.conf
deleted file mode 100644
index 786e6dd..0000000
--- a/files/etc/tmpfiles.d/webmap.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-d %t/lock/webmap            00755 root root
-
-# for `webmap-download --lockdir` *and* `webmap-import --lockdir-sources`
-# (hence the set-group-ID bit and g+w)
-d %t/lock/webmap/cache      02775 _webmap-download _webmap
-
-# for `webmap-import --lockfile`
-f %t/lock/webmap/lock       00644 _webmap _webmap