diff --git a/legacy/projects/docker_swarm/ansible/inventory/hosts.yml b/legacy/projects/docker_swarm/ansible/inventory/hosts.yml index 55cb1f8..a7b1508 100644 --- a/legacy/projects/docker_swarm/ansible/inventory/hosts.yml +++ b/legacy/projects/docker_swarm/ansible/inventory/hosts.yml @@ -7,5 +7,5 @@ all: hosts: bancomart: ansible_host: bancomart.dmz - vpay: - ansible_host: vpay.dmz + # vpay: + # ansible_host: vpay.dmz diff --git a/legacy/projects/docker_swarm/ansible/roles/freshrss/docker-stack.yml.j2 b/legacy/projects/docker_swarm/ansible/roles/freshrss/docker-stack.yml.j2 index bf341fd..ac4760a 100644 --- a/legacy/projects/docker_swarm/ansible/roles/freshrss/docker-stack.yml.j2 +++ b/legacy/projects/docker_swarm/ansible/roles/freshrss/docker-stack.yml.j2 @@ -10,12 +10,7 @@ volumes: driver_opts: type: "nfs" o: "addr=lewis.dmz,nolock,soft,rw" - device: ":/mnt/data/freshrss/data" - extensions: - driver_opts: - type: "nfs" - o: "addr=lewis.dmz,nolock,soft,rw" - device: ":/mnt/data/freshrss/extensions" + device: ":/mnt/data/nfs/freshrss/data" services: freshrss: @@ -28,11 +23,6 @@ services: target: /var/www/FreshRSS/data volume: nocopy: true - - type: volume - source: extensions - target: /var/www/FreshRSS/extensions - volume: - nocopy: true environment: TZ: Europe/Amsterdam CRON_MIN: '2,32' diff --git a/nixos/machines/default.nix b/nixos/machines/default.nix index 572f87f..9aca512 100644 --- a/nixos/machines/default.nix +++ b/nixos/machines/default.nix @@ -4,10 +4,13 @@ hostName = "jefke.hyp"; nixosModule.lab = { - dataDisk.enable = true; terraformDatabase.enable = true; - # k3s.enable = true; - disko.osDiskDevice = "/dev/nvme0n1"; + disko.osDiskDevice = "/dev/sda"; + + dataDisk = { + enable = true; + devicePath = "/dev/nvme0n1p1"; + }; ssh = { useCertificates = true;