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

Merge pull request #14 from saltstack-formulas/default-passwords-are-evil

Browse source 
Drop default AdminAuth
This commit is contained in:
Niels Abspoel 2018-04-27 14:39:39 +02:00 committed by GitHub
commit b6e402e699
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apt-cacher/ng/files/security.conf
View file

@ -7,6 +7,10 @@
# Basic authentication with username and password, required to
# visit pages with administrative functionality. Format: username:password
{% from "apt-cacher/ng/map.jinja" import apt_cacher_ng with context %}
AdminAuth: {{ apt_cacher_ng.admin_account }}:{{ apt_cacher_ng.admin_passwd }}
{%- set cfg = salt['pillar.get']('apt_cacher_ng', {}) %}
{%- set admin_account = cfg.get('admin_account', False) %}
{%- set admin_passwd = cfg.get('admin_passwd', False) %}
{%- if admin_account and admin_passwd %}
AdminAuth: {{ admin_account }}:{{ admin_passwd }}
{%- endif %}

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

@ -13,7 +13,5 @@
'service': 'apt-cacher-ng',
'credentials': '/etc/apt-cacher-ng/security.conf',
'client_config': '/etc/apt/apt.conf.d/80proxy',
'admin_account': 'root',
'admin_passwd': 'admin'
},
}, merge=salt['pillar.get']('apt_cacher_ng')) %}