[taler-merchant] branch master updated (385b1d3d -> 818ff6b2)

[gnunet]

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

grothoff pushed a change to branch master
in repository merchant.

    from 385b1d3d fix config for demo setup
     new fc3cd71b improve nginx configuration consistency
     new 818ff6b2 bump Debian version

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/changelog                                | 6 ++++++
 debian/etc/nginx/sites-available/taler-merchant | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 070b8aea..b20a5b7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+taler-merchant (0.9.2-2) unstable; urgency=low
+
+  * Further improvements to Debian package.
+
+ -- Christian Grothoff <grothoff@gnu.org>  Sat, 3 Mar 2023 23:50:12 +0200
+
 taler-merchant (0.9.2-1) unstable; urgency=low
 
   * Minor improvements to Debian package.
diff --git a/debian/etc/nginx/sites-available/taler-merchant 
b/debian/etc/nginx/sites-available/taler-merchant
index 8de78a88..30ed62db 100644
--- a/debian/etc/nginx/sites-available/taler-merchant
+++ b/debian/etc/nginx/sites-available/taler-merchant
@@ -12,14 +12,16 @@ server {
     # - replace with your actual server name
     server_name localhost;
 
-    location / {
+    access_log /var/log/nginx/merchant.log;
+    error_log /var/log/nginx/merchant.err;
+    location /taler-merchant/ {
          proxy_pass 
http://unix:/var/run/taler/merchant-httpd/merchant-http.sock;
          proxy_redirect off;
          proxy_set_header Host $host;
 
          # NOTE:
          # - put your actual DNS name here
-         proxy_set_header X-Forwarded-Host "example.com";
+         proxy_set_header X-Forwarded-Host "localhost";
 
          # NOTE:
          # - uncomment the following line if you are using HTTPS

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