Linux-Help/formula-apt-cacher
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #10 from jpic/server_extra_config

Browse source 
Allow the user to add extra server config
This commit is contained in:
puneet kandhari 2015-09-25 09:55:59 -05:00
commit 0baeeb3faa
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
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 }} CacheDir: {{ apt_cacher_ng.server_cache_dir }}
LogDir: {{ apt_cacher_ng.server_log_dir }} LogDir: {{ apt_cacher_ng.server_log_dir }}
Port: {{ apt_cacher_ng.server_port }} Port: {{ apt_cacher_ng.server_port }}
{% if apt_cacher_ng.server_extra_config -%}
{{ apt_cacher_ng.server_extra_config }}
{% endif -%}

1
apt-cacher/ng/map.jinja
View file

@ -3,6 +3,7 @@
'server_address': 'localhost', 'server_address': 'localhost',
'server_bind_address': '0.0.0.0', 'server_bind_address': '0.0.0.0',
'server_port': '3142', 'server_port': '3142',
'server_extra_config': '',
'server_config': '/etc/apt-cacher-ng/zzz_acng.conf', 'server_config': '/etc/apt-cacher-ng/zzz_acng.conf',
'server_cache_dir': '/var/cache/apt-cacher-ng', 'server_cache_dir': '/var/cache/apt-cacher-ng',
'server_log_dir': '/var/log/apt-cacher-ng', 'server_log_dir': '/var/log/apt-cacher-ng',

4
pillar.example
View file

@ -20,6 +20,10 @@ apt_cacher_ng:
server_port: 3142 server_port: 3142
server_cache_dir: /var/cache/apt-cacher-ng server_cache_dir: /var/cache/apt-cacher-ng
server_log_dir: /var/log/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. # Credentials for apt-cacher-ng Web management interface.
# http://<server_adress>:<server_port>/acng-report.html # http://<server_adress>:<server_port>/acng-report.html