support localhost cacher

files/dnsmasq/dnsmasq.conf.j2

@@ -116,12 +116,12 @@ dhcp-boot=tag:{{br.name}},{{ dnsmasq.pxe.file }},,{{ dnsmasq.pxe.address }}
 
 {% if dnsmasq.aptCacher is defined and dnsmasq.aptCacher %}
 # apt cacher
-{% if dnsmasq.aptCacher != "localhost" %}
+{% if dnsmasq.aptCacher == "localhost" or (dnsmasq.aptCacher.localhost is defined and dnsmasq.aptCacher.localhost) %}
 ## In-built apt cacher
-{{setAptCacher(dnsmasq.aptCacher)}}
-{% else %}
-## Remote apt cacher
 {{setAptCacher(services.address)}}
+{% elif %}
+## Remote apt cacher
+{{setAptCacher(dnsmasq.aptCacher)}}
 {% endif %}
 
 {% endif %}

files/services/docker-compose.yml.j2

@@ -21,7 +21,7 @@ services:
     ports:
       - '{{services.address}}:1688:1688'
 {% endif %}
-{% if dnsmasq.aptCacher is defined and dnsmasq.aptCacher == "localhost" %}
+{% if dnsmasq.aptCacher is defined and (dnsmasq.aptCacher == "localhost" or (dnsmasq.aptCacher.localhost is defined and dnsmasq.aptCacher.localhost) %}
   apt-cacher-ng:
     restart: always
     image: git-registry.mycard.moe/nanahira/apt-cacher-ng-docker:latest
@@ -30,7 +30,7 @@ services:
     ports:
       - '{{services.address}}:80:80'
     volumes:
-      - ./apt-cacher-ng:/var/cache/apt-cacher-ng
+      - {{ dnsmasq.aptCacher.path | default('./apt-cacher-ng') }}:/var/cache/apt-cacher-ng
 {% endif %}
 {% if dnsmasq.pxe is defined and (dnsmasq.pxe == "localhost" or (dnsmasq.pxe.localhost is defined and dnsmasq.pxe.localhost)) %}
   pxe-tftp: