Revert "Drop default AdminAuth"

This reverts commit e4d1e7de10.
Sry, I was on the wrong branch.

apt-cacher/ng/files/security.conf

@@ -7,10 +7,6 @@
 
 # Basic authentication with username and password, required to
 # visit pages with administrative functionality. Format: username:password
-{%- 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 %}
+{% from "apt-cacher/ng/map.jinja" import apt_cacher_ng with context %}
+AdminAuth: {{ apt_cacher_ng.admin_account }}:{{ apt_cacher_ng.admin_passwd }}
 

apt-cacher/ng/map.jinja

@@ -13,5 +13,7 @@
         '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')) %}