From c3a1a4ecbea0c8df729b7a29da5d31c1f9dab9c9 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 1 Sep 2021 00:59:34 +0200
Subject: separate DB creation from plugin loading; fix misc. Debian package
 issues

---
 debian/anastasis-httpd.postinst     |  6 ++++++
 debian/db/install/pgsql             |  2 +-
 debian/etc/anastasis/anastasis.conf | 21 +++++++++++++++++++++
 debian/rules                        |  2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'debian')

diff --git a/debian/anastasis-httpd.postinst b/debian/anastasis-httpd.postinst
index fe89acb..994b06b 100644
--- a/debian/anastasis-httpd.postinst
+++ b/debian/anastasis-httpd.postinst
@@ -20,6 +20,12 @@ configure)
     adduser --quiet --system --ingroup ${_GROUPNAME} --no-create-home --home ${TALER_HOME} ${_USERNAME}
   fi
 
+  if ! dpkg-statoverride --list /etc/anastasis/secrets/anastasis-db.secret.conf >/dev/null 2>&1; then
+    dpkg-statoverride --add --update \
+      anastasis-httpd root 460 \
+      /etc/anastasis/secrets/anastasis-db.secret.conf
+  fi
+
   # Setup postgres database (needs dbconfig-pgsql package)
   if [ -f /usr/share/dbconfig-common/dpkg/postinst.pgsql ]; then
     . /usr/share/dbconfig-common/dpkg/postinst.pgsql
diff --git a/debian/db/install/pgsql b/debian/db/install/pgsql
index dab5d1e..f695fed 100755
--- a/debian/db/install/pgsql
+++ b/debian/db/install/pgsql
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
diff --git a/debian/etc/anastasis/anastasis.conf b/debian/etc/anastasis/anastasis.conf
index e662a43..4d0deda 100644
--- a/debian/etc/anastasis/anastasis.conf
+++ b/debian/etc/anastasis/anastasis.conf
@@ -1,5 +1,26 @@
 [anastasis]
 DATABASE = postgres
+SERVE = unix
+
+# You must set each of the following options
+# before starting anastasis-httpd!
+#
+# Storage fee for policies (per year)
+#ANNUAL_FEE = KUDOS:0
+#
+# Storage fee for truth
+#TRUTH_UPLOAD_FEE = KUDOS:0
+
+# Name of your business
+#BUSINESS_NAME = ""
+
+# Random server salt. Use output of 'uuidgen'
+#SERVER_SALT = ""
+
+# How high is the per key share insurance offered
+# by your business?
+#INSURANCE = KUDOS:0
+
 
 [taler]
 # Currency accepted by anastasis via GNU Taler payments.
diff --git a/debian/rules b/debian/rules
index e3c7db5..cfd43c7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ override_dh_install:
 	dh_install
 # Done manually for debhelper-compat<13
 	dh_installtmpfiles
-# Remove files already present in libtalerexchange from main taler-exchange package
+# Remove files already present in libanastasis-dev/cli from anastasis-httpd/libanastasis packages
 	cd debian/libanastasis-dev; find . -type f,l -exec rm -f ../anastasis-httpd/{} \;
 	cd debian/anastasis-cli; find . -type f -exec rm -f ../anastasis-httpd/{} \;
 	cd debian/libanastasis-dev; find . -type f,l -exec rm -f ../libanastasis/{} \;
-- 
cgit v1.2.3