diff options
| author | Florian Dold <florian@dold.me> | 2024-12-03 01:43:22 +0100 |
|---|---|---|
| committer | Florian Dold <florian@dold.me> | 2024-12-03 01:43:22 +0100 |
| commit | 9438e7495f0545e6771e2b225002a0b9540998fe (patch) | |
| tree | 1878a774bde59f0e2001e75aaff6a511d3015415 | |
| parent | 8c19e89cd0a3cfde3e4376aa691244f864dd5f7d (diff) | |
fix socket pathsHEADv0.14.1-dev.11master
| -rw-r--r-- | debian/etc/apache2/sites-available/taler-merchant.conf | 2 | ||||
| -rw-r--r-- | debian/etc/nginx/sites-available/taler-merchant | 2 | ||||
| -rw-r--r-- | debian/taler-merchant.tmpfiles | 2 | ||||
| -rw-r--r-- | src/backend/merchant.conf | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/debian/etc/apache2/sites-available/taler-merchant.conf b/debian/etc/apache2/sites-available/taler-merchant.conf index 5d0050a7..948b29cf 100644 --- a/debian/etc/apache2/sites-available/taler-merchant.conf +++ b/debian/etc/apache2/sites-available/taler-merchant.conf @@ -14,7 +14,7 @@ # Apache documentation. # <Location "/"> - ProxyPass "unix:/var/run/taler/merchant-httpd/merchant-http.sock|http://example.com/" + ProxyPass "unix:/var/run/taler-merchant/httpd/merchant-http.sock|http://example.com/" # NOTE: # - Uncomment this line if you use TLS/HTTPS diff --git a/debian/etc/nginx/sites-available/taler-merchant b/debian/etc/nginx/sites-available/taler-merchant index 30ed62db..9bdbc4e2 100644 --- 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/ { - proxy_pass http://unix:/var/run/taler/merchant-httpd/merchant-http.sock; + proxy_pass http://unix:/var/run/taler-merchant/httpd/merchant-http.sock; proxy_redirect off; proxy_set_header Host $host; diff --git a/debian/taler-merchant.tmpfiles b/debian/taler-merchant.tmpfiles index 0c3f7cf4..fde68ae9 100644 --- a/debian/taler-merchant.tmpfiles +++ b/debian/taler-merchant.tmpfiles @@ -1,2 +1,2 @@ #Type Path Mode UID GID Age Argument -d /run/taler/merchant-httpd 0755 taler-merchant-httpd www-data - - +d /run/taler-merchant/httpd 0755 taler-merchant-httpd www-data - - diff --git a/src/backend/merchant.conf b/src/backend/merchant.conf index 1231eddd..cfb13c18 100644 --- a/src/backend/merchant.conf +++ b/src/backend/merchant.conf @@ -30,7 +30,7 @@ LEGAL_PRESERVATION = 11 years # Which unix domain path should we bind to? Only used if "SERVE" is 'unix'. -UNIXPATH = ${TALER_RUNTIME_DIR}/merchant-httpd/merchant-http.sock +UNIXPATH = ${TALER_RUNTIME_DIR}/httpd/merchant-http.sock # What should be the file access permissions (see chmod) for "UNIXPATH"? UNIXPATH_MODE = 660 |