diff --git a/.gitattributes b/.gitattributes index 6c14b67..e1f0efc 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ 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 diff --git a/README.md b/README.md index 21735e1..f95eb04 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,15 @@ 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 +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 diff --git a/bind9/guiotte.db b/bind9/guiotte.db new file mode 100644 index 0000000..d0aec4c --- /dev/null +++ b/bind9/guiotte.db @@ -0,0 +1,20 @@ +; +; 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. diff --git a/bind9/named.conf b/bind9/named.conf index 5f3902c..db50a4d 100644 --- a/bind9/named.conf +++ b/bind9/named.conf @@ -59,3 +59,8 @@ zone "lan" { type master; file "/etc/bind/lan.db"; }; + +zone "guiotte.fr" { + type master; + file "/etc/bind/guiotte.db"; +}; diff --git a/ddclient/ddclient.conf b/ddclient/ddclient.conf new file mode 100644 index 0000000..5a0a079 Binary files /dev/null and b/ddclient/ddclient.conf differ diff --git a/docker-compose.yml b/docker-compose.yml index 5ef3f0f..f65de29 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,7 @@ 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: @@ -25,7 +26,7 @@ services: - PUID=1000 - PGID=1000 - TZ=CEST - - URL=a.guiotte.fr + - URL=guiotte.fr - SUBDOMAINS=wildcard - VALIDATION=dns - DNSPLUGIN=ovh @@ -36,6 +37,17 @@ 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 @@ -47,36 +59,36 @@ services: - SESSION_COOKIE_SECURE=False - SECRET_KEY=yolo - flood: - image: jesec/flood - container_name: flood - user: 1000:100 - restart: unless-stopped - depends_on: - - rtorrent - command: --port 3001 --allowedpath /data - environment: - HOME: /config - volumes: - - ./flood:/config - - /mnt/storage/download:/data - ports: - - 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 + # flood: + # image: jesec/flood + # container_name: flood + # user: 1000:100 + # restart: unless-stopped + # depends_on: + # - rtorrent + # command: --port 3001 --allowedpath /data + # environment: + # HOME: /config + # volumes: + # - ./flood:/config + # - /mnt/storage/download:/data + # ports: + # - 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 # radarr: