diff --git a/bind9/named.conf b/bind9/named.conf index 08c7659..5f3902c 100644 --- a/bind9/named.conf +++ b/bind9/named.conf @@ -18,9 +18,17 @@ options { //Set the IP addresses of your ISP's DNS servers: forwarders { - 80.67.169.12; // fdn.fr - 80.67.169.40; // fdn.fr - 1.1.1.1; // Cloudflare + // Aalto University + //130.233.224.132; + //130.233.224.140; + //130.233.224.141; + + // France + //80.67.169.12; // fdn.fr + //80.67.169.40; // fdn.fr + + // Global + 1.1.1.1; // Cloudflare }; allow-query { goodclients; }; diff --git a/docker-compose.yml b/docker-compose.yml index d767f9c..5ef3f0f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -78,21 +78,21 @@ services: ports: - 6881:6881 - - radarr: - image: lscr.io/linuxserver/radarr:latest - container_name: radarr - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Paris - volumes: - - ./radarr:/config - - /mnt/storage/video/Films/:/movies - - /mnt/storage/download/:/downloads - ports: - - 7878:7878 - restart: unless-stopped + # WIP + # radarr: + # image: lscr.io/linuxserver/radarr:latest + # container_name: radarr + # environment: + # - PUID=1000 + # - PGID=1000 + # - TZ=Europe/Paris + # volumes: + # - ./radarr:/config + # - /mnt/storage/video/Films/:/movies + # - /mnt/storage/download/:/downloads + # ports: + # - 7878:7878 + # restart: unless-stopped syncthing: @@ -149,26 +149,26 @@ services: - PUID=1000 - TZ=Europe/Paris - - zotero: - #image: lscr.io/linuxserver/nginx:latest - #image: sashgorokhov/webdav - build: zotero - container_name: zotero - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Paris - - USERNAME=user - - PASSWORD=passwd - volumes: - - zotero-data:/data - #- zotero-data:/media - restart: unless-stopped - # https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/master/Dockerfile - # https://github.com/linuxserver/docker-nginx/blob/master/Dockerfile - # https://github.com/sashgorokhov/docker-nginx-webdav/blob/master/Dockerfile - # XXX: Missing "nginx-extra" in my build? + # WIP + # zotero: + # #image: lscr.io/linuxserver/nginx:latest + # #image: sashgorokhov/webdav + # build: zotero + # container_name: zotero + # environment: + # - PUID=1000 + # - PGID=1000 + # - TZ=Europe/Paris + # - USERNAME=user + # - PASSWORD=passwd + # volumes: + # - zotero-data:/data + # #- zotero-data:/media + # restart: unless-stopped + # # https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/master/Dockerfile + # # https://github.com/linuxserver/docker-nginx/blob/master/Dockerfile + # # https://github.com/sashgorokhov/docker-nginx-webdav/blob/master/Dockerfile + # # XXX: Missing "nginx-extra" in my build? taskserver: diff --git a/syncthing/config.xml b/syncthing/config.xml index 494295d..d1142b0 100644 Binary files a/syncthing/config.xml and b/syncthing/config.xml differ