diff options
| author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2021-10-12 20:58:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 20:58:56 +0300 |
| commit | cd53bf7accfde9fe2d2232a73cf85813752a15cd (patch) | |
| tree | 91a4ce8b7c025f7349844817fc68ec133c72e509 /nixos/modules/services/monitoring | |
| parent | 344844948c5042fbd824ce00b5058261a91e3343 (diff) | |
| parent | 975ab7f3a02ac0232afe7920a8f7d78fc22d5ccb (diff) | |
Merge pull request #140076 from jraygauthier/jrg/96633_fix-teamviewer-client-server-issue
teamviewer: fix #96633, #44307 and #97148 + 15.15.5 -> 15.18.5 -> 15.22.3
Diffstat (limited to 'nixos/modules/services/monitoring')
| -rw-r--r-- | nixos/modules/services/monitoring/teamviewer.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixos/modules/services/monitoring/teamviewer.nix index ce9e57a187cdc..e2271e571c40c 100644 --- a/nixos/modules/services/monitoring/teamviewer.nix +++ b/nixos/modules/services/monitoring/teamviewer.nix @@ -24,18 +24,21 @@ in environment.systemPackages = [ pkgs.teamviewer ]; + services.dbus.packages = [ pkgs.teamviewer ]; + systemd.services.teamviewerd = { description = "TeamViewer remote control daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "NetworkManager-wait-online.service" "network.target" ]; + after = [ "NetworkManager-wait-online.service" "network.target" "dbus.service" ]; + requires = [ "dbus.service" ]; preStart = "mkdir -pv /var/lib/teamviewer /var/log/teamviewer"; startLimitIntervalSec = 60; startLimitBurst = 10; serviceConfig = { - Type = "forking"; - ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -d"; + Type = "simple"; + ExecStart = "${pkgs.teamviewer}/bin/teamviewerd -f"; PIDFile = "/run/teamviewerd.pid"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "on-abort"; |