diff --git a/Timeline.org b/Timeline.org index 0f1b726..969d97b 100644 --- a/Timeline.org +++ b/Timeline.org @@ -29,12 +29,10 @@ - [ ] VPN setup *** TODO Wireguard [0/1] [0%] - [ ] Encrypted DNS -** Data sync [1/2] [50%] -*** IN-PROGRESS Syncthing [2/3] [66%] - - [X] Basic configuration - - [X] Relay server - - [ ] Discovery server -*** DONE Radicale [1/2] [50%] +** Data sync [2/2] [100%] +*** DONE Syncthing + CLOSED: [2019-11-14 Thu 17:09] +*** DONE Radicale [1/1] [100%] CLOSED: [2019-11-08 Fri 13:51] - [X] Harden password ** Web stack [1/7] [14%] @@ -45,7 +43,7 @@ - [ ] Miniflux vhost *** TODO PHP [0/1] [0%] - [ ] Php-fpm -*** TODO PostgreSQL [0/1] [0%] +*** IN-PROGRESS PostgreSQL [0/1] [0%] - [ ] Restore DBs *** DONE ACME [3/3] [100%] CLOSED: [2019-11-10 Sun 21:47] diff --git a/modules/datasync.nix b/modules/datasync.nix index 1e00b4c..c79ba0b 100644 --- a/modules/datasync.nix +++ b/modules/datasync.nix @@ -4,8 +4,6 @@ environment.systemPackages = with pkgs; [ syncthing - syncthing-relay - syncthing-discovery radicale ]; @@ -20,8 +18,6 @@ monolith = { id = "QGDGEZQ-INE7XDY-DNX2QI4-QI7ANQJ-57REEO2-FUMH545-FZS5RYU-ULF7HA2"; }; roamer = { id = "DS3PJH3-J6SNMHM-XUJTDLO-DHGJL5U-J3RUMAG-4OSJWIK-VSJSDVJ-PIHZ2QP"; }; }; - #cert = ""; - #key = ""; folders = { "Documents" = { devices = [ "monolith" "roamer" ]; id = "wusdj-bfjkr"; }; "Notes" = { devices = [ "monolith" "roamer" ]; id = "2aqt7-vpprc"; }; @@ -30,7 +26,6 @@ "Security" = { devices = [ "monolith" "roamer" ]; id = "z4lpn-pmm3v"; }; "Projects" = { devices = [ "monolith" ]; id = "cjhmu-avy9v"; }; - Documents.type = "receiveonly"; Projects.type = "receiveonly"; Documents.path = "/vault/syncthing/Documents"; @@ -41,11 +36,6 @@ Projects.path = "/vault/syncthing/Projects"; }; }; - relay = { - enable = true; - pools = [ "" ]; - listenAddress = "0.0.0.0"; - }; }; # Enable Radicale diff --git a/modules/networking.nix b/modules/networking.nix index 82bf288..0292587 100644 --- a/modules/networking.nix +++ b/modules/networking.nix @@ -19,7 +19,6 @@ allowedTCPPorts = [ 631 # Cups 6566 # SANE - 22067 # Syncthing relay 80 443 ];