.gitattributes

@@ -1,5 +1,4 @@
 ovh.ini filter=git-crypt diff=git-crypt
 syncthing/config.xml filter=git-crypt diff=git-crypt
-ddclient/ddclient.conf filter=git-crypt diff=git-crypt
 *.pem filter=git-crypt diff=git-crypt
 *.env filter=git-crypt diff=git-crypt

README.md

@@ -18,15 +18,6 @@ Once DNS are properly setup on host:
 
 - Socket: `/config/.local/share/rtorrent/rtorrent.sock`
 
-## Create a new service
-
-1. Add the service in `docker-compose.yml`
-2. Create the DynHost <https://www.ovh.com/manager/#/web/domain/guiotte.fr/dynhost>
-3. Add the host in the DDclient configuration `./ddclient/ddclient.conf`
-4. Add the nginx proxy configuration in `./swag/nginx/proxy-confs/`
-5. Update the local zone in `./bind9/guiotte.db`
-6. Restart `bind9` and `swag`: `dcc restart bind9 swag`
-
 ## Logs
 
     2022-11-02 Created OVH token

bind9/guiotte.db

@@ -1,20 +0,0 @@
-;
-; BIND data file for local loopback interface
-;
-$TTL  604800
-@  IN  SOA  dm.guiotte.fr. root.localhost. (
-      39
-      604800
-      86400
-      2419200
-      604800 )
-;
-@  IN  NS  dm.guiotte.fr.
-
-; OVH
-guiotte.fr.        IN  A       37.59.61.141
-*.guiotte.fr.      IN  CNAME   guiotte.fr.
-
-; LAN
-dm.guiotte.fr.     IN  A       192.168.1.2
-money.guiotte.fr.  IN  CNAME   dm.guiotte.fr.

bind9/named.conf

@@ -18,17 +18,9 @@ options {
 
 	//Set the IP addresses of your ISP's DNS servers:
 	forwarders {
-        // Aalto University
+   80.67.169.12; // fdn.fr
-        //130.233.224.132;
+   80.67.169.40; // fdn.fr
-        //130.233.224.140;
+	 1.1.1.1; // Cloudflare
-        //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; };
@@ -59,8 +51,3 @@ zone "lan" {
      type master;
      file "/etc/bind/lan.db";
 };
-
-zone "guiotte.fr" {
-    type master;
-    file "/etc/bind/guiotte.db";
-};

docker-compose.yml

@@ -10,7 +10,6 @@ services:
       - ./bind9/named.conf:/etc/bind/named.conf
       - ./bind9/local.db:/etc/bind/local.db
       - ./bind9/lan.db:/etc/bind/lan.db
-      - ./bind9/guiotte.db:/etc/bind/guiotte.db
     environment:
       - TZ=CEST
     ports:
@@ -26,7 +25,7 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=CEST
-      - URL=guiotte.fr
+      - URL=a.guiotte.fr
       - SUBDOMAINS=wildcard
       - VALIDATION=dns
       - DNSPLUGIN=ovh
@@ -37,17 +36,6 @@ services:
       - 443:443
       - 80:80
 
-  ddclient:
-    image: lscr.io/linuxserver/ddclient:latest
-    container_name: ddclient
-    restart: unless-stopped
-    environment:
-      - PUID=1000
-      - PGID=1000
-      - TZ=CEST
-    volumes:
-      - ./ddclient:/config
-
   money:
     image: ihatemoney/ihatemoney
     container_name: money
@@ -59,52 +47,52 @@ services:
       - SESSION_COOKIE_SECURE=False
       - SECRET_KEY=yolo
 
-        #  flood:
+  flood:
-        #    image: jesec/flood
+    image: jesec/flood
-        #    container_name: flood
+    container_name: flood
-        #    user: 1000:100
+    user: 1000:100
-        #    restart: unless-stopped
+    restart: unless-stopped
-        #    depends_on:
+    depends_on:
-        #      - rtorrent
+      - rtorrent
-        #    command: --port 3001 --allowedpath /data
+    command: --port 3001 --allowedpath /data
-        #    environment:
+    environment:
-        #      HOME: /config
+      HOME: /config
-        #    volumes:
+    volumes:
-        #      - ./flood:/config
+      - ./flood:/config
-        #      - /mnt/storage/download:/data
+      - /mnt/storage/download:/data
-        #    ports:
+    ports:
-        #      - 3001:3001
+      - 3001:3001
-        #
-        #  rtorrent:
-        #    image: jesec/rtorrent
-        #    container_name: rtorrent
-        #    hostname: rtorrent
-        #    user: 1000:100
-        #    restart: unless-stopped
-        #    command: -o network.port_range.set=6881-6881,system.daemon.set=true
-        #    environment:
-        #      HOME: /config
-        #    volumes:
-        #      - ./flood:/config
-        #      - /mnt/storage/download:/data
-        #    ports:
-        #      - 6881:6881 
 
-        # WIP
+  rtorrent:
-        #  radarr:
+    image: jesec/rtorrent
-        #    image: lscr.io/linuxserver/radarr:latest
+    container_name: rtorrent
-        #    container_name: radarr
+    hostname: rtorrent
-        #    environment:
+    user: 1000:100
-        #      - PUID=1000
+    restart: unless-stopped
-        #      - PGID=1000
+    command: -o network.port_range.set=6881-6881,system.daemon.set=true
-        #      - TZ=Europe/Paris
+    environment:
-        #    volumes:
+      HOME: /config
-        #      - ./radarr:/config
+    volumes:
-        #      - /mnt/storage/video/Films/:/movies
+      - ./flood:/config
-        #      - /mnt/storage/download/:/downloads
+      - /mnt/storage/download:/data
-        #    ports:
+    ports:
-        #      - 7878:7878
+      - 6881:6881 
-        #    restart: unless-stopped
+
+
+  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:
@@ -161,26 +149,26 @@ services:
       - PUID=1000
       - TZ=Europe/Paris
 
-        # WIP
+
-        #  zotero:
+  zotero:
-        #    #image: lscr.io/linuxserver/nginx:latest
+    #image: lscr.io/linuxserver/nginx:latest
-        #    #image: sashgorokhov/webdav
+    #image: sashgorokhov/webdav
-        #    build: zotero
+    build: zotero
-        #    container_name: zotero
+    container_name: zotero
-        #    environment:
+    environment:
-        #      - PUID=1000
+      - PUID=1000
-        #      - PGID=1000
+      - PGID=1000
-        #      - TZ=Europe/Paris
+      - TZ=Europe/Paris
-        #      - USERNAME=user
+      - USERNAME=user
-        #      - PASSWORD=passwd
+      - PASSWORD=passwd
-        #    volumes:
+    volumes:
-        #      - zotero-data:/data
+      - zotero-data:/data
-        #      #- zotero-data:/media
+      #- zotero-data:/media
-        #    restart: unless-stopped
+    restart: unless-stopped
-        #    # https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/master/Dockerfile
+    # https://github.com/linuxserver/docker-baseimage-alpine-nginx/blob/master/Dockerfile
-        #    # https://github.com/linuxserver/docker-nginx/blob/master/Dockerfile
+    # https://github.com/linuxserver/docker-nginx/blob/master/Dockerfile
-        #    # https://github.com/sashgorokhov/docker-nginx-webdav/blob/master/Dockerfile
+    # https://github.com/sashgorokhov/docker-nginx-webdav/blob/master/Dockerfile
-        #    # XXX: Missing "nginx-extra" in my build?
+    # XXX: Missing "nginx-extra" in my build?
     
 
   taskserver: