From f3932009e57d5c9319f577596ee072ac4e003970 Mon Sep 17 00:00:00 2001
From: jpic <jamespic@gmail.com>
Date: Fri, 25 Sep 2015 16:44:00 +0200
Subject: [PATCH] Allow the user to add extra server config

---
 apt-cacher/ng/files/server.conf | 3 +++
 apt-cacher/ng/map.jinja         | 1 +
 pillar.example                  | 4 ++++
 3 files changed, 8 insertions(+)

diff --git a/apt-cacher/ng/files/server.conf b/apt-cacher/ng/files/server.conf
index 7fa6948..57de349 100644
--- a/apt-cacher/ng/files/server.conf
+++ b/apt-cacher/ng/files/server.conf
@@ -3,3 +3,6 @@ BindAddress: {{ apt_cacher_ng.server_bind_address }}
 CacheDir: {{ apt_cacher_ng.server_cache_dir }}
 LogDir: {{ apt_cacher_ng.server_log_dir }}
 Port: {{ apt_cacher_ng.server_port }}
+{% if apt_cacher_ng.server_extra_config -%}
+{{ apt_cacher_ng.server_extra_config }}
+{% endif -%}
diff --git a/apt-cacher/ng/map.jinja b/apt-cacher/ng/map.jinja
index 4dd1209..aea97a6 100644
--- a/apt-cacher/ng/map.jinja
+++ b/apt-cacher/ng/map.jinja
@@ -3,6 +3,7 @@
         'server_address': 'localhost',
         'server_bind_address': '0.0.0.0',
         'server_port': '3142',
+        'server_extra_config': '',
         'server_config': '/etc/apt-cacher-ng/zzz_acng.conf',
         'server_cache_dir': '/var/cache/apt-cacher-ng',
         'server_log_dir': '/var/log/apt-cacher-ng',
diff --git a/pillar.example b/pillar.example
index 0c4fb7b..62cd5eb 100644
--- a/pillar.example
+++ b/pillar.example
@@ -20,6 +20,10 @@ apt_cacher_ng:
   server_port: 3142
   server_cache_dir: /var/cache/apt-cacher-ng
   server_log_dir: /var/log/apt-cacher-ng
+  server_extra_config: |
+    # Workaround apt-cacher-ng 500 Invalid header
+    # https://lists.alioth.debian.org/pipermail/apt-cacher-ng-users/2013-September/000082.html
+    ReuseConnections: 0
 
   # Credentials for apt-cacher-ng Web management interface.
   # http://<server_adress>:<server_port>/acng-report.html