Merge branch 'master' into staging

2019-09-02 23:25:24 +02:00
parent b291f2a995 12ae04518b
commit f21211ebfe
277 changed files with 4766 additions and 1895 deletions
@@ -50,7 +50,7 @@ in
      };

      dataDir = mkOption {
-        type = types.string;
+        type = types.path;
        default = "/var/lib/softether";
        description = ''
          Data directory for SoftEther VPN.