diff --git a/README.org b/README.org index 7894ecda..75ae04e8 100644 --- a/README.org +++ b/README.org @@ -23,10 +23,9 @@ Docker source: [[https://hub.docker.com/r/shenxn/protonmail-bridge][Docker]] / [ To initialise: #+begin_src bash -# Stop systemd service if already running -systemctl --user stop protonmail-bridge.service -# Log in to protonmail-bridge --cli -podman run --rm -it -v protonmail:/root shenxn/protonmail-bridge init +systemctl --user stop protonmail-bridge.service \ + && podman run --rm -it -v protonmail:/root shenxn/protonmail-bridge init \ + && systemctl --user start protonmail-bridge.service #+end_src and follow normal login system for cli. @@ -51,10 +50,11 @@ Register app-password with gnome-keyring: secret-tool store --label="UKAEA mail mbsync" email evie.litherland-smith@ukaea.uk #+end_src *** Configuration -Example .davmail.properties needs copying to home directory, make rule can handle this. -Will need to restart systemd service after copying to pick up new settings +On first run (or if token expires), stop systemd service and run manually to complete manual auth. Token will stay valid for a little while (no idea how long specifically). #+begin_src bash -systemctl --user restart davmail.service +systemctl --user stop davmail.service \ + && nix run nixpkgs#davmail -- -notray ~/.davmail.properties \ + && systemctl --user start davmail.service #+end_src * Vdirsyncer ** Password diff --git a/home/accounts/.davmail.properties b/home/accounts/.davmail.properties index f32d4936..c61dddb0 100644 --- a/home/accounts/.davmail.properties +++ b/home/accounts/.davmail.properties @@ -1,5 +1,5 @@ davmail.server=true -davmail.mode=O365Interactive +davmail.mode=O365Manual davmail.url=https://outlook.office365.com/EWS/Exchange.asmx davmail.imapPort=1144 davmail.smtpPort=1026