diff --git a/npm.yml b/npm.yml index a353f3a..5e0e833 100644 --- a/npm.yml +++ b/npm.yml @@ -12,14 +12,27 @@ services: environment: TZ: 'Asia/Yekaterinburg' - - # Uncomment this if you want to change the location of - # the SQLite DB file within the container - # DB_SQLITE_FILE: "/data/database.sqlite" - - # Uncomment this if IPv6 is not enabled on your host - # DISABLE_IPV6: 'true' - + volumes: - ./data:/data - ./letsencrypt:/etc/letsencrypt + pihole: + container_name: pihole + image: pihole/pihole:latest + ports: + - '53:53/tcp' + - '53:53/udp' + - '82:80/tcp' + - '4443:443/tcp' + environment: + TZ: 'Asia/Yekaterinburg' + FTLCONF_webserver_api_password: 'trpcar' + FTLCONF_misc_check_load: false + FTLCONF_dns_listeningMode: 'ALL' + volumes: + - './etc-pihole:/etc/pihole' + cap_add: + - NET_ADMIN + - SYS_TIME + - SYS_NICE + restart: unless-stopped diff --git a/pihole.yml b/pihole.yml deleted file mode 100644 index 3327cd0..0000000 --- a/pihole.yml +++ /dev/null @@ -1,21 +0,0 @@ -services: - pihole: - container_name: pihole - image: pihole/pihole:latest - ports: - - '53:53/tcp' - - '53:53/udp' - - '82:80/tcp' - - '4443:443/tcp' - environment: - TZ: 'Asia/Yekaterinburg' - FTLCONF_webserver_api_password: 'trpcar' - FTLCONF_misc_check_load: false - FTLCONF_dns_listeningMode: 'ALL' - volumes: - - './etc-pihole:/etc/pihole' - cap_add: - - NET_ADMIN - - SYS_TIME - - SYS_NICE - restart: unless-stopped \ No newline at end of file