diff --git a/vars/docker.ini b/vars/docker.ini index b19e525..8375a52 100644 --- a/vars/docker.ini +++ b/vars/docker.ini @@ -1,6 +1,5 @@ [docker_host] docker-host11 -docker-host12 [docker_lb] docker-lb diff --git a/vars/group_vars/docker/docker.yml b/vars/group_vars/docker/docker.yml index ff43330..1184e00 100644 --- a/vars/group_vars/docker/docker.yml +++ b/vars/group_vars/docker/docker.yml @@ -7,23 +7,6 @@ docker: compose: "/opt/docker/compose/" services: - # - name: status - # vm: - # - docker-host12 - # container_name: kuma - # image: louislam/uptime-kuma:1.23.16 - # volumes: - # - name: "Data" - # internal: /app/data - # external: "{{ docker.directories.local }}/kuma/" - # ports: - # - name: "http" - # internal: 3001 - # external: "{{ services_external_http.kuma }}" - # environment: - # - PUID=1000 - # - PGID=1000 - # - TZ=Europe/Berlin - name: jellyfin vm: - docker-host11 @@ -54,42 +37,6 @@ services: internal: 8096 external: "{{ services_external_http.jellyfin }}" environment: - # - name: ddns - # vm: - # - docker-host12 - # container_name: ddns-updater - # image: qmcgaw/ddns-updater:2 - # volumes: - # - name: "Configuration" - # internal: /updater/data/ - # external: "{{ docker.directories.local }}/ddns-updater/data/" - # ports: - # - name: "http" - # internal: 8000 - # external: "{{ services_external_http.ddns }}" - # - name: lidarr - # vm: - # - docker-host12 - # container_name: lidarr - # image: linuxserver/lidarr:2.10.3 - # volumes: - # - name: "Configuration" - # internal: /config - # external: "{{ docker.directories.local }}/lidarr/config" - # - name: "Music" - # internal: /music - # external: /media/songs - # - name: "Torrent Downloads" - # internal: /downloads - # external: /media/downloads/lidarr - # ports: - # - name: "http" - # internal: 8686 - # external: "{{ services_external_http.lidarr }}" - # environment: - # - PUID=1000 - # - PGID=1000 - # - TZ=Europe/Berlin - name: git vm: - docker-host11 @@ -118,99 +65,3 @@ services: environment: - USER_UID=1000 - USER_GID=1000 - # - name: changedetection - # vm: - # - docker-host12 - # container_name: changedetection - # image: dgtlmoon/changedetection.io:0.49 - # healthcheck: curl - # volumes: - # - name: "Data" - # internal: /datastore - # external: "{{ docker.directories.local }}/changedetection/data/" - # ports: - # - name: "http" - # internal: 5000 - # external: "{{ services_external_http.changedetection }}" - - name: gluetun - vm: - - docker-host12 - container_name: gluetun - image: qmcgaw/gluetun:v3.40 - cap_add: - - NET_ADMIN - devices: - - name: "Tunnel" - internal: /dev/net/tun - external: /dev/net/tun - volumes: - - name: "Configuration" - internal: /gluetun - external: "{{ docker.directories.local }}/gluetun/config" - ports: - - name: "Qbit Client" - internal: 8082 - external: 8082 - - name: "Torrentleech Client" - internal: 8083 - external: 8083 - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Berlin - - VPN_SERVICE_PROVIDER=protonvpn - - UPDATER_VPN_SERVICE_PROVIDERS=protonvpn - - UPDATER_PERIOD=24h - - "SERVER_COUNTRIES={{ vault_docker.proton.country }}" - - "OPENVPN_USER={{ vault_docker.proton.openvpn_user }}" - - "OPENVPN_PASSWORD={{ vault_docker.proton.openvpn_password }}" - - name: torrentleech - vm: - - docker-host12 - container_name: torrentleech - image: qbittorrentofficial/qbittorrent-nox - depends_on: - - gluetun - network_mode: "container:gluetun" - volumes: - - name: "Configuration" - internal: /config - external: "{{ docker.directories.local }}/torrentleech/config" - - name: "Downloads" - internal: /downloads - external: /media/downloads - ports: - - name: "http" - internal: proxy_only - external: 8083 - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Berlin - - QBT_EULA="accept" - - QBT_WEBUI_PORT="8083" - - name: qbit - vm: - - docker-host12 - container_name: qbit - image: qbittorrentofficial/qbittorrent-nox:5.0.4-1 - depends_on: - - gluetun - network_mode: "container:gluetun" - volumes: - - name: "Configuration" - internal: /config - external: "{{ docker.directories.local }}/qbit/config" - - name: "Downloads" - internal: /downloads - external: /media/downloads - ports: - - name: "http" - internal: proxy_only - external: 8082 - environment: - - PUID=1000 - - PGID=1000 - - TZ=Europe/Berlin - - QBT_EULA="accept" - - QBT_WEBUI_PORT="8082" diff --git a/vars/group_vars/proxmox/vms.yml b/vars/group_vars/proxmox/vms.yml index ffe8278..c884ed0 100644 --- a/vars/group_vars/proxmox/vms.yml +++ b/vars/group_vars/proxmox/vms.yml @@ -1,17 +1,4 @@ vms: - - name: "docker-host10" - node: "lulu" - vmid: 410 - cores: 2 - memory: 4096 # in MiB - net: - net0: "virtio,bridge=vmbr0,firewall=1" - boot_image: "{{ proxmox_cloud_init_images.debian.name }}" - ciuser: "{{ user }}" - sshkeys: "{{ pubkey }}" - disk_size: 128 # in Gb - hostpci: - hostpci0: "mapping=quicksync-lulu" - name: "docker-host11" node: "inko01" vmid: 411 @@ -25,17 +12,6 @@ vms: disk_size: 128 # in Gb hostpci: hostpci0: "mapping=quicksync-inko01" - - name: "docker-host12" - node: "inko01" - vmid: 412 - cores: 4 - memory: 8192 - net: - net0: "virtio,bridge=vmbr0,firewall=1" - boot_image: "{{ proxmox_cloud_init_images.ubuntu.name }}" - ciuser: "{{ user }}" - sshkeys: "{{ pubkey }}" - disk_size: 128 # in Gb - name: "k3s-server10" node: "naruto01" vmid: 110