diff --git a/legacy/projects/docker_swarm/ansible/playbooks/stacks.yml b/legacy/projects/docker_swarm/ansible/playbooks/stacks.yml index f931587..40cac0a 100644 --- a/legacy/projects/docker_swarm/ansible/playbooks/stacks.yml +++ b/legacy/projects/docker_swarm/ansible/playbooks/stacks.yml @@ -4,20 +4,14 @@ roles: - {role: traefik, tags: traefik} - {role: forgejo, tags: forgejo} - # - {role: seafile, tags: seafile} - {role: radicale, tags: radicale} - # - {role: mastodon, tags: mastodon} - {role: freshrss, tags: freshrss} - {role: hedgedoc, tags: hedgedoc} - # - {role: overleaf, tags: overleaf} - {role: cyberchef, tags: cyberchef} - {role: inbucket, tags: inbucket} - {role: kms, tags: kms} - {role: swarm_dashboard, tags: swarm_dashboard} - # - {role: shephard, tags: shephard} - {role: pihole, tags: pihole} - {role: nextcloud, tags: nextcloud} - {role: syncthing, tags: syncthing} - # - {role: monitoring, tags: monitoring} - {role: kitchenowl, tags: kitchenowl} - # - {role: ampache, tags: ampache} 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/default.nix b/nixos/default.nix index f2b74a4..6556728 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -110,9 +110,10 @@ tree file tcpdump + lsof + parted ]; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;