[taler-merchant] branch master updated (7f133ce5 -> 887cb001)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository merchant.

    from 7f133ce5 typo
     new 827eeaec debian: socket path
     new 887cb001 debian: tmpfiles

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/taler-merchant.tmpfiles | 2 ++
 src/backend/merchant.conf      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 debian/taler-merchant.tmpfiles

diff --git a/debian/taler-merchant.tmpfiles b/debian/taler-merchant.tmpfiles
new file mode 100644
index 00000000..0c3f7cf4
--- /dev/null
+++ b/debian/taler-merchant.tmpfiles
@@ -0,0 +1,2 @@
+#Type Path        Mode UID  GID  Age Argument
+d /run/taler/merchant-httpd 0755 taler-merchant-httpd www-data  - -
diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf
index 1fdc17ea..ee492691 100644
--- a/src/backend/merchant.conf
+++ b/src/backend/merchant.conf
@@ -23,7 +23,7 @@ LEGAL_PRESERVATION = 11 years
 
 
 # Which unix domain path should we bind to? Only used if "SERVE" is 'unix'.
-UNIXPATH = ${TALER_RUNTIME_DIR}/merchant.http
+UNIXPATH = ${TALER_RUNTIME_DIR}/merchant-httpd/merchant-http.sock
 # What should be the file access permissions (see chmod) for "UNIXPATH"?
 UNIXPATH_MODE = 660
 

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.