merchant

commit 3e09269691517c7bb95cd413b8b36a5aae155852
parent 8145acda94ba0bb1fc2bbe6cda3bfb12b9fffd5a
Author: bohdan-potuzhnyi <bohdan.potuzhnyi@gmail.com>
Date:   Mon, 31 Mar 2025 22:40:38 +0200

updating the apache config + small fix of the nginx conf

Diffstat:
M
debian/etc/apache2/sites-available/taler-merchant.conf
 | 
38
++++++++++++++++++++++++++++++++------
M
debian/etc/nginx/sites-available/taler-merchant
 | 
2
+-

2 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/debian/etc/apache2/sites-available/taler-merchant.conf b/debian/etc/apache2/sites-available/taler-merchant.conf
@@ -13,10 +13,36 @@
 # For all of the above, please read the respective
 # Apache documentation.
 #
-<Location "/">
-  ProxyPass "unix:/var/run/taler-merchant/httpd/merchant-http.sock|http://example.com/"
+<VirtualHost *:80>
+    ServerName %%your.domain%%
 
-  # NOTE:
-  # - Uncomment this line if you use TLS/HTTPS
-  RequestHeader add "X-Forwarded-Proto" "https"
-</Location>
+    ErrorLog /var/log/apache2/merchant-error.log
+    CustomLog /var/log/apache2/merchant-access.log combined
+
+    ProxyPreserveHost On
+    ProxyRequests Off
+
+    ProxyPass        / unix:/var/run/taler-merchant/httpd/merchant-http.sock|http://localhost/
+    ProxyPassReverse / unix:/var/run/taler-merchant/httpd/merchant-http.sock|http://localhost/
+
+    RequestHeader set X-Forwarded-Proto "http"
+</VirtualHost>
+
+<VirtualHost *:443>
+    ServerName %%your.domain%%
+
+    ErrorLog /var/log/apache2/merchant-error.log
+    CustomLog /var/log/apache2/merchant-access.log combined
+
+    SSLEngine On
+    SSLCertificateFile    /etc/letsencrypt/live/%%your.domain%%/fullchain.pem
+    SSLCertificateKeyFile /etc/letsencrypt/live/%%your.domain%%/privkey.pem
+
+    ProxyPreserveHost On
+    ProxyRequests Off
+
+    ProxyPass        / unix:/var/run/taler-merchant/httpd/merchant-http.sock|http://localhost/
+    ProxyPassReverse / unix:/var/run/taler-merchant/httpd/merchant-http.sock|http://localhost/
+
+    RequestHeader set X-Forwarded-Proto "https"
+</VirtualHost>
diff --git a/debian/etc/nginx/sites-available/taler-merchant b/debian/etc/nginx/sites-available/taler-merchant
@@ -15,7 +15,7 @@ server {
     access_log /var/log/nginx/merchant.log;
     error_log /var/log/nginx/merchant.err;
 
-    location /taler-merchant/ {
+    location / {
          proxy_pass http://unix:/var/run/taler-merchant/httpd/merchant-http.sock;
          proxy_redirect off;
          proxy_set_header Host $host;