From f8aee0d438a76d220218aabe3f3cfcec87b7a532 Mon Sep 17 00:00:00 2001 From: Petru Paler Date: Wed, 22 Oct 2025 15:01:01 +0100 Subject: [PATCH] Move wordpress to NFS. This removes the need for the syncthing and rysnc plumbing. --- common/compute-node.nix | 3 +- common/syncthing-data.nix | 53 ----------------------------------- services/wordpress-backup.hcl | 30 -------------------- services/wordpress.hcl | 2 +- 4 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 common/syncthing-data.nix delete mode 100644 services/wordpress-backup.hcl diff --git a/common/compute-node.nix b/common/compute-node.nix index a6d4c71..f5c0949 100644 --- a/common/compute-node.nix +++ b/common/compute-node.nix @@ -1,11 +1,10 @@ { pkgs, ... }: { - # Compute node: Cluster node with Nomad, GlusterFS server, and Syncthing + # Compute node: Cluster node with Nomad and GlusterFS server # Used by: c1, c2, c3 imports = [ ./cluster-node.nix ./glusterfs.nix ./nomad.nix - ./syncthing-data.nix ]; } diff --git a/common/syncthing-data.nix b/common/syncthing-data.nix deleted file mode 100644 index f029620..0000000 --- a/common/syncthing-data.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - # TODO: when deploying this to a new machine for the first time, first - # comment this out to get /data/sync created with the right owner and - # permissions. then, do it again with persistence enabled. - # This could list the owner user but I'm not sure if it's already created at - # the time impermanence setup runs. - # Note: chown syncthing:syncthing /data/sync && chmod 700 /data/sync also seems to work - environment.persistence."/persist".directories = [ "/data/sync" ]; - - services.syncthing = { - enable = true; - dataDir = "/data/sync"; - openDefaultPorts = true; - #guiAddress = "0.0.0.0:8384"; - overrideDevices = true; - overrideFolders = true; - settings = { - devices = { - "c1" = { - id = "XJECP3R-AZHCAYX-UIQKHIT-AHBK5UM-KM7T4OV-B7SEUCW-ZE2UFPG-7BNAIQZ"; - }; - "c2" = { - id = "II4XUXQ-7WCH3SB-FU655O7-NI6DYYW-GQCJS6J-K7USRC2-XLM5J5W-6ZCWPQU"; - }; - "c3" = { - id = "D3C3YII-A3QGUNF-LHOGZNX-GJ4ZF3X-VVLMNY5-BBKF3BO-KNHKJMD-EA5QYQJ"; - }; - "zippy" = { - id = "WXDYZWN-JG2OBQH-CC42RMM-LPJGTS6-Y2BV37J-TYSLHL4-VHGYL5M-URI42QJ"; - }; - }; - folders = { - "wordpress" = { - path = "/data/sync/wordpress"; - devices = [ - "c1" - "c2" - "c3" - "zippy" - ]; - ignorePerms = false; - versioning = { - type = "staggered"; - params = { - cleanInterval = "3600"; - maxAge = "15768000"; - }; - }; - }; - }; - }; - }; -} diff --git a/services/wordpress-backup.hcl b/services/wordpress-backup.hcl deleted file mode 100644 index ffd79a2..0000000 --- a/services/wordpress-backup.hcl +++ /dev/null @@ -1,30 +0,0 @@ -job "wordpress-backup" { - datacenters = ["alo"] - type = "batch" - - periodic { - crons = ["*/5 * * * * *"] - prohibit_overlap = true - } - - group "cron" { - task "rsync" { - driver = "raw_exec" - - config { - command = "/bin/sh" - args = [ "local/script.sh" ] - } - - template { - destination = "local/script.sh" - data = <