diff --git a/Ansible/playbook-pi5.yml b/Ansible/playbook-pi5.yml index 1adec2d..ba70c56 100755 --- a/Ansible/playbook-pi5.yml +++ b/Ansible/playbook-pi5.yml @@ -97,6 +97,7 @@ dest: ~/.profile state: present line: "alias ll='ls -alrth'" + - name: update profile griffix avec l'alias qui va bien lineinfile: dest: ~/.profile @@ -123,7 +124,7 @@ become: true - synchronize: - src: /media/Seagate/Ansible_conf/config/ + src: /media/Seagate/backups/pi5/config/ dest: /config/ delegate_to: "{{ inventory_hostname }}" become: true @@ -139,4 +140,4 @@ - name: create and deploy docker compose services community.docker.docker_compose_v2: project_src: /config/ - register: output \ No newline at end of file + register: output diff --git a/docker/pi5/docker-compose.yaml b/docker/pi5/docker-compose.yaml index 3bf4a23..92e675b 100755 --- a/docker/pi5/docker-compose.yaml +++ b/docker/pi5/docker-compose.yaml @@ -1,5 +1,44 @@ --- services: + pihole: + container_name: pihole + image: pihole/pihole:latest + ports: + # DNS Ports + - "53:53/tcp" + - "53:53/udp" + # Default HTTP Port + - "80:80/tcp" + # Default HTTPs Port. FTL will generate a self-signed certificate + - "443:443/tcp" + # Uncomment the below if using Pi-hole as your DHCP Server + #- "67:67/udp" + # Uncomment the line below if you are using Pi-hole as your NTP server + #- "123:123/udp" + environment: + # Set the appropriate timezone for your location from + # https://en.wikipedia.org/wiki/List_of_tz_database_time_zones, e.g: + TZ: 'Europe/Paris' + # Set a password to access the web interface. Not setting one will result in a random password being assigned + FTLCONF_webserver_api_password: 'correct horse battery staple' + # If using Docker's default `bridge` network setting the dns listening mode should be set to 'all' + FTLCONF_dns_listeningMode: 'all' + # Volumes store your data between container upgrades + volumes: + # For persisting Pi-hole's databases and common configuration file + - '/config/etc-pihole:/etc/pihole' + # Uncomment the below if you have custom dnsmasq config files that you want to persist. Not needed for most starting fresh with Pi-hole v6. If you're upgrading from v5 you and have used this directory before, you should keep it enabled for the first v6 container start to allow for a complete migration. It can be removed afterwards. Needs environment variable FTLCONF_misc_etc_dnsmasq_d: 'true' + #- './etc-dnsmasq.d:/etc/dnsmasq.d' + cap_add: + # See https://github.com/pi-hole/docker-pi-hole#note-on-capabilities + # Required if you are using Pi-hole as your DHCP server, else not needed + - NET_ADMIN + # Required if you are using Pi-hole as your NTP client to be able to set the host's system time + - SYS_TIME + # Optional, if Pi-hole should get some more processing time + - SYS_NICE + restart: unless-stopped + portainer: image: portainer/portainer-ce:latest container_name: portainer diff --git a/infra_conf/backup.sh b/infra_conf/backup.sh index e00ef87..e79397c 100755 --- a/infra_conf/backup.sh +++ b/infra_conf/backup.sh @@ -2,8 +2,8 @@ DestDir="/mnt/data/backups/arch-griffix/griffix/" -rsync -avuz --exclude ".local/share/Steam" --exclude "Games" --exclude "Téléchargements" /home/griffix/ $DestDir +rsync -avuz --exclude ".local/share/Steam" --exclude "Games" --exclude "Téléchargements" --exclude ".cache" /home/griffix/ $DestDir rsync -avuz /mnt/pi5data/backups/pi5 /mnt/data/backups/ rsync -avuz /mnt/pi5data/backups/immich /mnt/data/backups/ -rsync -avuz --exclude ".local/share/Steam" --exclude "Games" --exclude "Téléchargements" /home/griffix /mnt/pi5data/backups/ +rsync -avuz --exclude ".local/share/Steam" --exclude "Games" --exclude "Téléchargements" --exclude ".cache" /home/griffix /mnt/pi5data/backups/ exit $? diff --git a/infra_conf/home_backup.sh b/infra_conf/home_backup.sh deleted file mode 100755 index e69de29..0000000