Browse Source

Allow the user to add extra server config

tags/v0.5.0
jpic 9 years ago
parent
commit
f3932009e5
3 changed files with 8 additions and 0 deletions
  1. +3
    -0
      apt-cacher/ng/files/server.conf
  2. +1
    -0
      apt-cacher/ng/map.jinja
  3. +4
    -0
      pillar.example

+ 3
- 0
apt-cacher/ng/files/server.conf View File

@@ -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 -%}

+ 1
- 0
apt-cacher/ng/map.jinja View File

@@ -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',

+ 4
- 0
pillar.example View File

@@ -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

Loading…
Cancel
Save