summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2016-01-27 22:26:23 +0100
committerGravatar Christian Hesse <mail@eworm.de>2016-01-27 22:26:23 +0100
commitd58da38557ba5b47e86a8f3fdb61a969af4a4589 (patch)
tree99bb711840161d39b70fa16f4066f34a0d7b53e4
parent37ddd6040ce9ba3cab820ca9e21731e23bfd6838 (diff)
parenta3d89d4fb8a82a6425433c59e30fbc7c6b163a50 (diff)
downloadpacredir-d58da38557ba5b47e86a8f3fdb61a969af4a4589.tar.gz
pacredir-d58da38557ba5b47e86a8f3fdb61a969af4a4589.tar.zst
Merge branch 'darkhttpd-1-12'
-rw-r--r--pacredir.c4
-rw-r--r--systemd/pacdbserve.service2
-rw-r--r--systemd/pacserve.service2
3 files changed, 4 insertions, 4 deletions
diff --git a/pacredir.c b/pacredir.c
index 9dcbf5b..13fbe3c 100644
--- a/pacredir.c
+++ b/pacredir.c
@@ -222,8 +222,8 @@ static void * get_http_code(void * data) {
if ((curl = curl_easy_init()) != NULL) {
curl_easy_setopt(curl, CURLOPT_URL, request->url);
- /* darkhttpd only serves IPv4, so limit curl to that */
- curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
+ /* try to resolve addresses to all IP versions that your system allows */
+ curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER);
/* tell libcurl to follow redirection */
curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
/* set user agent */
diff --git a/systemd/pacdbserve.service b/systemd/pacdbserve.service
index fcde113..09d1792 100644
--- a/systemd/pacdbserve.service
+++ b/systemd/pacdbserve.service
@@ -5,7 +5,7 @@ After=network.target
[Service]
User=nobody
Group=nobody
-ExecStart=/usr/bin/darkhttpd /var/lib/pacman/sync/ --port 7079
+ExecStart=/usr/bin/darkhttpd /var/lib/pacman/sync/ --ipv6 --port 7079 --no-listing
ProtectSystem=full
ProtectHome=on
PrivateDevices=on
diff --git a/systemd/pacserve.service b/systemd/pacserve.service
index 6ec4aab..198e931 100644
--- a/systemd/pacserve.service
+++ b/systemd/pacserve.service
@@ -5,7 +5,7 @@ After=network.target
[Service]
User=nobody
Group=nobody
-ExecStart=/usr/bin/darkhttpd /var/cache/pacman/pkg/ --port 7078
+ExecStart=/usr/bin/darkhttpd /var/cache/pacman/pkg/ --ipv6 --port 7078 --no-listing
ProtectSystem=full
ProtectHome=on
PrivateDevices=on