public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #35343 from gnidorah/softether 

softether module: fix dataDir option
This commit is contained in:
Jörg Thalheim 2018-02-23 12:38:11 +00:00 committed by GitHub
parent 4ec94f679c c6cd69341a
commit df4963daca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
nixos/modules/services/networking/softether.nix
View File

@ -5,6 +5,8 @@ with lib;
let let
cfg = config.services.softether; cfg = config.services.softether;
package = cfg.package.override { dataDir = cfg.dataDir; };
in in
{ {
@ -49,7 +51,7 @@ in
dataDir = mkOption { dataDir = mkOption {
type = types.string; type = types.string;
default = "${cfg.package.dataDir}"; default = "/var/lib/softether";
description = '' description = ''
Data directory for SoftEther VPN. Data directory for SoftEther VPN.
''; '';
@ -64,11 +66,8 @@ in
config = mkIf cfg.enable ( config = mkIf cfg.enable (
mkMerge [{ mkMerge [{
environment.systemPackages = [ environment.systemPackages = [ package ];
(pkgs.lib.overrideDerivation cfg.package (attrs: {
dataDir = cfg.dataDir;
}))
];
systemd.services."softether-init" = { systemd.services."softether-init" = {
description = "SoftEther VPN services initial task"; description = "SoftEther VPN services initial task";
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
@ -80,11 +79,11 @@ in
for d in vpnserver vpnbridge vpnclient vpncmd; do for d in vpnserver vpnbridge vpnclient vpncmd; do
if ! test -e ${cfg.dataDir}/$d; then if ! test -e ${cfg.dataDir}/$d; then
${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
install -m0600 ${cfg.package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2 install -m0600 ${package}${cfg.dataDir}/$d/hamcore.se2 ${cfg.dataDir}/$d/hamcore.se2
fi fi
done done
rm -rf ${cfg.dataDir}/vpncmd/vpncmd rm -rf ${cfg.dataDir}/vpncmd/vpncmd
ln -s ${cfg.package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd ln -s ${package}${cfg.dataDir}/vpncmd/vpncmd ${cfg.dataDir}/vpncmd/vpncmd
''; '';
}; };
} }
@ -97,12 +96,12 @@ in
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
serviceConfig = { serviceConfig = {
Type = "forking"; Type = "forking";
ExecStart = "${cfg.package}/bin/vpnserver start"; ExecStart = "${package}/bin/vpnserver start";
ExecStop = "${cfg.package}/bin/vpnserver stop"; ExecStop = "${package}/bin/vpnserver stop";
}; };
preStart = '' preStart = ''
rm -rf ${cfg.dataDir}/vpnserver/vpnserver rm -rf ${cfg.dataDir}/vpnserver/vpnserver
ln -s ${cfg.package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver ln -s ${package}${cfg.dataDir}/vpnserver/vpnserver ${cfg.dataDir}/vpnserver/vpnserver
''; '';
postStop = '' postStop = ''
rm -rf ${cfg.dataDir}/vpnserver/vpnserver rm -rf ${cfg.dataDir}/vpnserver/vpnserver
@ -118,12 +117,12 @@ in
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
serviceConfig = { serviceConfig = {
Type = "forking"; Type = "forking";
ExecStart = "${cfg.package}/bin/vpnbridge start"; ExecStart = "${package}/bin/vpnbridge start";
ExecStop = "${cfg.package}/bin/vpnbridge stop"; ExecStop = "${package}/bin/vpnbridge stop";
}; };
preStart = '' preStart = ''
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
ln -s ${cfg.package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge ln -s ${package}${cfg.dataDir}/vpnbridge/vpnbridge ${cfg.dataDir}/vpnbridge/vpnbridge
''; '';
postStop = '' postStop = ''
rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
@ -139,12 +138,12 @@ in
wantedBy = [ "network.target" ]; wantedBy = [ "network.target" ];
serviceConfig = { serviceConfig = {
Type = "forking"; Type = "forking";
ExecStart = "${cfg.package}/bin/vpnclient start"; ExecStart = "${package}/bin/vpnclient start";
ExecStop = "${cfg.package}/bin/vpnclient stop"; ExecStop = "${package}/bin/vpnclient stop";
}; };
preStart = '' preStart = ''
rm -rf ${cfg.dataDir}/vpnclient/vpnclient rm -rf ${cfg.dataDir}/vpnclient/vpnclient
ln -s ${cfg.package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient ln -s ${package}${cfg.dataDir}/vpnclient/vpnclient ${cfg.dataDir}/vpnclient/vpnclient
''; '';
postStart = '' postStart = ''
sleep 1 sleep 1

6
pkgs/servers/softether/4.18.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, openssl, readline, ncurses, zlib }: , openssl, readline, ncurses, zlib
, dataDir ? "/var/lib/softether" }:
let let
os = if stdenv.isLinux then "1" os = if stdenv.isLinux then "1"
@ -17,7 +18,6 @@ stdenv.mkDerivation rec {
version = "4.18"; version = "4.18";
build = "9570"; build = "9570";
compiledDate = "2015.07.26"; compiledDate = "2015.07.26";
dataDir = "/var/lib/softether";
src = fetchurl { src = fetchurl {
url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = https://www.softether.org/; homepage = https://www.softether.org/;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.rick68 ]; maintainers = [ maintainers.rick68 ];
platforms = platforms.linux; platforms = filter (p: p != "aarch64-linux") platforms.linux;
}; };
} }

6
pkgs/servers/softether/4.20.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, openssl, readline, ncurses, zlib }: , openssl, readline, ncurses, zlib
, dataDir ? "/var/lib/softether" }:
let let
os = if stdenv.isLinux then "1" os = if stdenv.isLinux then "1"
@ -17,7 +18,6 @@ stdenv.mkDerivation rec {
version = "4.20"; version = "4.20";
build = "9608"; build = "9608";
compiledDate = "2016.04.17"; compiledDate = "2016.04.17";
dataDir = "/var/lib/softether";
src = fetchurl { src = fetchurl {
url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = https://www.softether.org/; homepage = https://www.softether.org/;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.rick68 ]; maintainers = [ maintainers.rick68 ];
platforms = platforms.linux; platforms = filter (p: p != "aarch64-linux") platforms.linux;
}; };
} }

6
pkgs/servers/softether/4.25.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, openssl, readline, ncurses, zlib }: , openssl, readline, ncurses, zlib
, dataDir ? "/var/lib/softether" }:
let let
os = if stdenv.isLinux then "1" os = if stdenv.isLinux then "1"
@ -17,7 +18,6 @@ stdenv.mkDerivation rec {
version = "4.25"; version = "4.25";
build = "9656"; build = "9656";
compiledDate = "2018.01.15"; compiledDate = "2018.01.15";
dataDir = "/var/lib/softether";
src = fetchurl { src = fetchurl {
url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz"; url = "http://www.softether-download.com/files/softether/v${version}-${build}-rtm-${compiledDate}-tree/Source_Code/softether-src-v${version}-${build}-rtm.tar.gz";
@ -48,6 +48,6 @@ stdenv.mkDerivation rec {
homepage = https://www.softether.org/; homepage = https://www.softether.org/;
license = licenses.gpl2; license = licenses.gpl2;
maintainers = [ maintainers.rick68 ]; maintainers = [ maintainers.rick68 ];
platforms = platforms.linux; platforms = filter (p: p != "aarch64-linux") platforms.linux;
}; };
} }