sync

commit f21456ff14c0fad4daa9c6bef54fe768e0401995
parent 22026a2b96824f08e32036f9ac28f688676da33f
Author: Christian Grothoff <grothoff@gnunet.org>
Date:   Sun, 12 Oct 2025 19:35:00 +0200

Merge branch 'master' of git+ssh://git.taler.net/sync

Diffstat:
M
contrib/ci/Containerfile
 | 
6
+++---
M
contrib/ci/jobs/5-deploy-package/job.sh
 | 
2
+-
M
debian/changelog
 | 
6
++++++
M
debian/sync-httpd.service
 | 
12
++++++++++++
A
debian/sync-httpd.socket
 | 
14
++++++++++++++
M
doc/doxygen/sync.doxy
 | 
2
+-

6 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile
@@ -1,4 +1,4 @@
-FROM docker.io/library/debian:bookworm
+FROM docker.io/library/debian:trixie
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -46,8 +46,8 @@ RUN apt-get update -yqq && \
    && rm -rf /var/lib/apt/lists/*
 
 # Install Taler (and friends) packages
-RUN curl -sS https://deb.taler.net/apt-nightly/taler-bookworm-ci.sources \
-    | tee /etc/apt/sources.list.d/taler-bookworm-ci.sources
+RUN curl -sS https://deb.taler.net/apt-nightly/taler-trixie-ci.sources \
+    | tee /etc/apt/sources.list.d/taler-trixie-ci.sources
 
 RUN echo '\
 Package: * \n\
diff --git a/contrib/ci/jobs/5-deploy-package/job.sh b/contrib/ci/jobs/5-deploy-package/job.sh
@@ -5,7 +5,7 @@ ARTIFACT_PATH="/artifacts/sync/${CI_COMMIT_REF}/*.deb"
 
 RSYNC_HOST="taler.host.internal"
 RSYNC_PORT=424242
-RSYNC_PATH="incoming_packages/bookworm-taler-ci/"
+RSYNC_PATH="incoming_packages/trixie-taler-ci/"
 RSYNC_DEST="rsync://${RSYNC_HOST}/${RSYNC_PATH}"
 
 
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+sync (1.1.0) unstable; urgency=low
+
+  * Release 1.1.0.
+
+ -- Christian Grothoff <christian@grothoff.org>  Wed, 08 Oct 2025 20:43:52 +0200
+
 sync (1.0.1) unstable; urgency=low
 
   * Release 1.0.1.
diff --git a/debian/sync-httpd.service b/debian/sync-httpd.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Sync backup backend
 After=postgresql.service network.target
+Requires=sync-httpd.socket
 
 [Service]
 User=sync-httpd
@@ -9,11 +10,22 @@ Restart=always
 RestartMode=direct
 RestartSec=1s
 RestartPreventExitStatus=9
+
+# Disable the service if more than 5 restarts are encountered within 5s.
+# These are usually the systemd defaults, but can be overwritten, thus we set
+# them here explicitly, as the exchange code assumes StartLimitInterval
+# to be >=5s.
+StartLimitBurst=5
+StartLimitInterval=5s
+
 RuntimeMaxSec=3600s
 ExecStart=/usr/bin/sync-httpd -c /etc/sync/sync.conf -L INFO
 
 StandardOutput=journal
 StandardError=journal
+PrivateTmp=yes
+PrivateDevices=yes
+ProtectSystem=full
 
 [Install]
 WantedBy=multi-user.target
diff --git a/debian/sync-httpd.socket b/debian/sync-httpd.socket
@@ -0,0 +1,14 @@
+[Unit]
+Description=Sync Socket
+PartOf=sync-httpd.service
+
+[Socket]
+ListenStream=/run/sync/httpd/sync-http.sock
+Accept=no
+Service=sync-httpd.service
+SocketUser=sync-httpd
+SocketGroup=www-data
+SocketMode=0660
+
+[Install]
+WantedBy=sockets.target
diff --git a/doc/doxygen/sync.doxy b/doc/doxygen/sync.doxy
@@ -38,7 +38,7 @@ PROJECT_NAME           = "GNU Taler: Sync"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 1.0.1
+PROJECT_NUMBER         = 1.1.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a