From fa6c8ec2a7fc71f05c2687f3e6411eae34831fdf Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <palo@pepe>
Date: Tue, 9 Oct 2018 22:13:58 +0200
Subject: nixos/modules: services.syncthing add guiAddress parameter

---
 nixos/modules/services/networking/syncthing.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'nixos/modules/services/networking')

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index c610b3b66606..cf21aa9eb70f 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -16,6 +16,14 @@ in {
         available on http://127.0.0.1:8384/.
       '';
 
+      guiAddress = mkOption {
+        type = types.string;
+        default = "127.0.0.1:8384";
+        description = ''
+          Address to serve the GUI.
+        '';
+      };
+
       systemService = mkOption {
         type = types.bool;
         default = true;
@@ -132,7 +140,12 @@ in {
           User = cfg.user;
           Group = cfg.group;
           PermissionsStartOnly = true;
-          ExecStart = "${cfg.package}/bin/syncthing -no-browser -home=${cfg.dataDir}";
+          ExecStart = ''
+            ${cfg.package}/bin/syncthing \
+              -no-browser \
+              -gui-address=${cfg.guiAddress} \
+              -home=${cfg.dataDir}
+          '';
         };
       };
 
-- 
cgit 1.4.1


From d2e1dd7fc715c675f2ba774a5b6174860d2a2b41 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <palo@pepe>
Date: Sun, 14 Oct 2018 06:46:36 +0200
Subject: nixos/modules: services.syncthing use types.str instead of
 types.string

As Infinisil mentioned in https://github.com/NixOS/nixpkgs/pull/48119#discussion_r224974201
---
 nixos/modules/services/networking/syncthing.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nixos/modules/services/networking')

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index cf21aa9eb70f..fd31b2a67687 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -17,7 +17,7 @@ in {
       '';
 
       guiAddress = mkOption {
-        type = types.string;
+        type = types.str;
         default = "127.0.0.1:8384";
         description = ''
           Address to serve the GUI.
@@ -31,7 +31,7 @@ in {
       };
 
       user = mkOption {
-        type = types.string;
+        type = types.str;
         default = defaultUser;
         description = ''
           Syncthing will be run under this user (user will be created if it doesn't exist.
@@ -40,7 +40,7 @@ in {
       };
 
       group = mkOption {
-        type = types.string;
+        type = types.str;
         default = "nogroup";
         description = ''
           Syncthing will be run under this group (group will not be created if it doesn't exist.
@@ -49,7 +49,7 @@ in {
       };
 
       all_proxy = mkOption {
-        type = types.nullOr types.string;
+        type = with types; nullOr str;
         default = null;
         example = "socks5://address.com:1234";
         description = ''
-- 
cgit 1.4.1