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

Drop default AdminAuth

apt-cacher/ng/files/security.conf

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

apt-cacher/ng/map.jinja

         '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')) %}