commit
bbf3c9483b
@ -56,6 +56,11 @@
|
|||||||
section of the NixOS manual</link> for more information.
|
section of the NixOS manual</link> for more information.
|
||||||
</para>
|
</para>
|
||||||
</listitem>
|
</listitem>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
<xref linkend="opt-services.samba-wsdd.enable" /> Web Services Dynamic Discovery host daemon
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
</itemizedlist>
|
</itemizedlist>
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
@ -583,6 +583,7 @@
|
|||||||
./services/network-filesystems/orangefs/client.nix
|
./services/network-filesystems/orangefs/client.nix
|
||||||
./services/network-filesystems/rsyncd.nix
|
./services/network-filesystems/rsyncd.nix
|
||||||
./services/network-filesystems/samba.nix
|
./services/network-filesystems/samba.nix
|
||||||
|
./services/network-filesystems/samba-wsdd.nix
|
||||||
./services/network-filesystems/tahoe.nix
|
./services/network-filesystems/tahoe.nix
|
||||||
./services/network-filesystems/diod.nix
|
./services/network-filesystems/diod.nix
|
||||||
./services/network-filesystems/u9fs.nix
|
./services/network-filesystems/u9fs.nix
|
||||||
|
124
nixos/modules/services/network-filesystems/samba-wsdd.nix
Normal file
124
nixos/modules/services/network-filesystems/samba-wsdd.nix
Normal file
@ -0,0 +1,124 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.samba-wsdd;
|
||||||
|
|
||||||
|
in {
|
||||||
|
options = {
|
||||||
|
services.samba-wsdd = {
|
||||||
|
enable = mkEnableOption ''
|
||||||
|
Enable Web Services Dynamic Discovery host daemon. This enables (Samba) hosts, like your local NAS device,
|
||||||
|
to be found by Web Service Discovery Clients like Windows.
|
||||||
|
<note>
|
||||||
|
<para>If you use the firewall consider adding the following:</para>
|
||||||
|
<programlisting>
|
||||||
|
networking.firewall.allowedTCPPorts = [ 5357 ];
|
||||||
|
networking.firewall.allowedUDPPorts = [ 3702 ];
|
||||||
|
</programlisting>
|
||||||
|
</note>
|
||||||
|
'';
|
||||||
|
interface = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
example = "eth0";
|
||||||
|
description = "Interface or address to use.";
|
||||||
|
};
|
||||||
|
hoplimit = mkOption {
|
||||||
|
type = types.nullOr types.int;
|
||||||
|
default = null;
|
||||||
|
example = 2;
|
||||||
|
description = "Hop limit for multicast packets (default = 1).";
|
||||||
|
};
|
||||||
|
workgroup = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
example = "HOME";
|
||||||
|
description = "Set workgroup name (default WORKGROUP).";
|
||||||
|
};
|
||||||
|
hostname = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
example = "FILESERVER";
|
||||||
|
description = "Override (NetBIOS) hostname to be used (default hostname).";
|
||||||
|
};
|
||||||
|
domain = mkOption {
|
||||||
|
type = types.nullOr types.str;
|
||||||
|
default = null;
|
||||||
|
description = "Set domain name (disables workgroup).";
|
||||||
|
};
|
||||||
|
discovery = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
default = false;
|
||||||
|
description = "Enable discovery operation mode.";
|
||||||
|
};
|
||||||
|
listen = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
default = "/run/wsdd/wsdd.sock";
|
||||||
|
description = "Listen on path or localhost port in discovery mode.";
|
||||||
|
};
|
||||||
|
extraOptions = mkOption {
|
||||||
|
type = types.listOf types.str;
|
||||||
|
default = [ "--shortlog" ];
|
||||||
|
example = [ "--verbose" "--no-http" "--ipv4only" "--no-host" ];
|
||||||
|
description = "Additional wsdd options.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
|
||||||
|
environment.systemPackages = [ pkgs.wsdd ];
|
||||||
|
|
||||||
|
systemd.services.samba-wsdd = {
|
||||||
|
description = "Web Services Dynamic Discovery host daemon";
|
||||||
|
after = [ "network.target" ];
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
DynamicUser = true;
|
||||||
|
Type = "simple";
|
||||||
|
ExecStart = ''
|
||||||
|
${pkgs.wsdd}/bin/wsdd ${optionalString (cfg.interface != null) "--interface '${cfg.interface}'"} \
|
||||||
|
${optionalString (cfg.hoplimit != null) "--hoplimit '${toString cfg.hoplimit}'"} \
|
||||||
|
${optionalString (cfg.workgroup != null) "--workgroup '${cfg.workgroup}'"} \
|
||||||
|
${optionalString (cfg.hostname != null) "--hostname '${cfg.hostname}'"} \
|
||||||
|
${optionalString (cfg.domain != null) "--domain '${cfg.domain}'"} \
|
||||||
|
${optionalString cfg.discovery "--discovery --listen '${cfg.listen}'"} \
|
||||||
|
${escapeShellArgs cfg.extraOptions}
|
||||||
|
'';
|
||||||
|
# Runtime directory and mode
|
||||||
|
RuntimeDirectory = "wsdd";
|
||||||
|
RuntimeDirectoryMode = "0750";
|
||||||
|
# Access write directories
|
||||||
|
UMask = "0027";
|
||||||
|
# Capabilities
|
||||||
|
CapabilityBoundingSet = "";
|
||||||
|
# Security
|
||||||
|
NoNewPrivileges = true;
|
||||||
|
# Sandboxing
|
||||||
|
ProtectSystem = "strict";
|
||||||
|
ProtectHome = true;
|
||||||
|
PrivateTmp = true;
|
||||||
|
PrivateDevices = true;
|
||||||
|
PrivateUsers = false;
|
||||||
|
ProtectHostname = true;
|
||||||
|
ProtectClock = true;
|
||||||
|
ProtectKernelTunables = true;
|
||||||
|
ProtectKernelModules = true;
|
||||||
|
ProtectKernelLogs = true;
|
||||||
|
ProtectControlGroups = true;
|
||||||
|
RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ];
|
||||||
|
RestrictNamespaces = true;
|
||||||
|
LockPersonality = true;
|
||||||
|
MemoryDenyWriteExecute = true;
|
||||||
|
RestrictRealtime = true;
|
||||||
|
RestrictSUIDSGID = true;
|
||||||
|
PrivateMounts = true;
|
||||||
|
# System Call Filtering
|
||||||
|
SystemCallArchitectures = "native";
|
||||||
|
SystemCallFilter = "~@clock @cpu-emulation @debug @module @mount @obsolete @privileged @raw-io @reboot @resources @swap";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
@ -315,6 +315,7 @@ in
|
|||||||
runInMachine = handleTest ./run-in-machine.nix {};
|
runInMachine = handleTest ./run-in-machine.nix {};
|
||||||
rxe = handleTest ./rxe.nix {};
|
rxe = handleTest ./rxe.nix {};
|
||||||
samba = handleTest ./samba.nix {};
|
samba = handleTest ./samba.nix {};
|
||||||
|
samba-wsdd = handleTest ./samba-wsdd.nix {};
|
||||||
sanoid = handleTest ./sanoid.nix {};
|
sanoid = handleTest ./sanoid.nix {};
|
||||||
sbt = handleTest ./sbt.nix {};
|
sbt = handleTest ./sbt.nix {};
|
||||||
sbt-extras = handleTest ./sbt-extras.nix {};
|
sbt-extras = handleTest ./sbt-extras.nix {};
|
||||||
|
44
nixos/tests/samba-wsdd.nix
Normal file
44
nixos/tests/samba-wsdd.nix
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
import ./make-test-python.nix ({ pkgs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
name = "samba-wsdd";
|
||||||
|
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ izorkin ];
|
||||||
|
|
||||||
|
nodes = {
|
||||||
|
client_wsdd = { pkgs, ... }: {
|
||||||
|
services.samba-wsdd = {
|
||||||
|
enable = true;
|
||||||
|
interface = "eth1";
|
||||||
|
workgroup = "WORKGROUP";
|
||||||
|
hostname = "CLIENT-WSDD";
|
||||||
|
discovery = true;
|
||||||
|
extraOptions = [ "--no-host" ];
|
||||||
|
};
|
||||||
|
networking.firewall.allowedTCPPorts = [ 5357 ];
|
||||||
|
networking.firewall.allowedUDPPorts = [ 3702 ];
|
||||||
|
};
|
||||||
|
|
||||||
|
server_wsdd = { ... }: {
|
||||||
|
services.samba-wsdd = {
|
||||||
|
enable = true;
|
||||||
|
interface = "eth1";
|
||||||
|
workgroup = "WORKGROUP";
|
||||||
|
hostname = "SERVER-WSDD";
|
||||||
|
};
|
||||||
|
networking.firewall.allowedTCPPorts = [ 5357 ];
|
||||||
|
networking.firewall.allowedUDPPorts = [ 3702 ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
testScript = ''
|
||||||
|
client_wsdd.start()
|
||||||
|
client_wsdd.wait_for_unit("samba-wsdd")
|
||||||
|
|
||||||
|
server_wsdd.start()
|
||||||
|
server_wsdd.wait_for_unit("samba-wsdd")
|
||||||
|
|
||||||
|
client_wsdd.wait_until_succeeds(
|
||||||
|
"echo list | ${pkgs.libressl.nc}/bin/nc -U /run/wsdd/wsdd.sock | grep -i SERVER-WSDD"
|
||||||
|
)
|
||||||
|
'';
|
||||||
|
})
|
34
pkgs/servers/wsdd/default.nix
Normal file
34
pkgs/servers/wsdd/default.nix
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
{ stdenv, fetchFromGitHub, makeWrapper, nixosTests, python3 }:
|
||||||
|
|
||||||
|
stdenv.mkDerivation rec {
|
||||||
|
pname = "wsdd";
|
||||||
|
version = "0.6.2";
|
||||||
|
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "christgau";
|
||||||
|
repo = pname;
|
||||||
|
rev = "v${version}";
|
||||||
|
sha256 = "0444xh1r5wd0zfch1hg1f9s4cw68srrm87hqx16qvlgx6jmz5j0p";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
|
buildInputs = [ python3 ];
|
||||||
|
|
||||||
|
installPhase = ''
|
||||||
|
install -Dm0755 src/wsdd.py $out/bin/wsdd
|
||||||
|
wrapProgram $out/bin/wsdd --prefix PYTHONPATH : "$PYTHONPATH"
|
||||||
|
'';
|
||||||
|
|
||||||
|
passthru = {
|
||||||
|
tests.samba-wsdd = nixosTests.samba-wsdd;
|
||||||
|
};
|
||||||
|
|
||||||
|
meta = with stdenv.lib; {
|
||||||
|
homepage = "https://github.com/christgau/wsdd";
|
||||||
|
description = "A Web Service Discovery (WSD) host daemon for SMB/Samba";
|
||||||
|
maintainers = with maintainers; [ izorkin ];
|
||||||
|
license = licenses.mit;
|
||||||
|
platforms = platforms.all;
|
||||||
|
};
|
||||||
|
}
|
@ -17624,6 +17624,8 @@ in
|
|||||||
|
|
||||||
webmetro = callPackage ../servers/webmetro { };
|
webmetro = callPackage ../servers/webmetro { };
|
||||||
|
|
||||||
|
wsdd = callPackage ../servers/wsdd { };
|
||||||
|
|
||||||
webhook = callPackage ../servers/http/webhook { };
|
webhook = callPackage ../servers/http/webhook { };
|
||||||
|
|
||||||
winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat.";
|
winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat.";
|
||||||
|
Loading…
Reference in New Issue
Block a user