mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-12 12:45:27 +03:00
Remove aiccu package and service due to sunsetting.
https://www.sixxs.net/main/
This commit is contained in:
Edward Tjörnhammar
parent
8198cc10f0
commit
3dcecf09fc
4 changed files with 6 additions and 229 deletions
|
|
@ -55,6 +55,12 @@ has the following highlights: </para>
|
||||||
following incompatible changes:</para>
|
following incompatible changes:</para>
|
||||||
|
|
||||||
<itemizedlist>
|
<itemizedlist>
|
||||||
|
<listitem>
|
||||||
|
<para>
|
||||||
|
<literal>aiccu</literal> package was removed. This is due to SixXS
|
||||||
|
<link xlink:href="https://www.sixxs.net/main/"> sunsetting</link> its IPv6 tunnel.
|
||||||
|
</para>
|
||||||
|
</listitem>
|
||||||
<listitem>
|
<listitem>
|
||||||
<para>
|
<para>
|
||||||
Top-level <literal>idea</literal> package collection was renamed.
|
Top-level <literal>idea</literal> package collection was renamed.
|
||||||
|
|
|
||||||
|
|
@ -389,7 +389,6 @@
|
||||||
./services/network-filesystems/u9fs.nix
|
./services/network-filesystems/u9fs.nix
|
||||||
./services/network-filesystems/yandex-disk.nix
|
./services/network-filesystems/yandex-disk.nix
|
||||||
./services/network-filesystems/xtreemfs.nix
|
./services/network-filesystems/xtreemfs.nix
|
||||||
./services/networking/aiccu.nix
|
|
||||||
./services/networking/amuled.nix
|
./services/networking/amuled.nix
|
||||||
./services/networking/asterisk.nix
|
./services/networking/asterisk.nix
|
||||||
./services/networking/atftpd.nix
|
./services/networking/atftpd.nix
|
||||||
|
|
|
||||||
|
|
@ -1,185 +0,0 @@
|
||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
|
|
||||||
cfg = config.services.aiccu;
|
|
||||||
notNull = a: ! isNull a;
|
|
||||||
configFile = pkgs.writeText "aiccu.conf" ''
|
|
||||||
${if notNull cfg.username then "username " + cfg.username else ""}
|
|
||||||
${if notNull cfg.password then "password " + cfg.password else ""}
|
|
||||||
protocol ${cfg.protocol}
|
|
||||||
server ${cfg.server}
|
|
||||||
ipv6_interface ${cfg.interfaceName}
|
|
||||||
verbose ${boolToString cfg.verbose}
|
|
||||||
daemonize true
|
|
||||||
automatic ${boolToString cfg.automatic}
|
|
||||||
requiretls ${boolToString cfg.requireTLS}
|
|
||||||
pidfile ${cfg.pidFile}
|
|
||||||
defaultroute ${boolToString cfg.defaultRoute}
|
|
||||||
${if notNull cfg.setupScript then cfg.setupScript else ""}
|
|
||||||
makebeats ${boolToString cfg.makeHeartBeats}
|
|
||||||
noconfigure ${boolToString cfg.noConfigure}
|
|
||||||
behindnat ${boolToString cfg.behindNAT}
|
|
||||||
${if cfg.localIPv4Override then "local_ipv4_override" else ""}
|
|
||||||
'';
|
|
||||||
|
|
||||||
in {
|
|
||||||
|
|
||||||
options = {
|
|
||||||
|
|
||||||
services.aiccu = {
|
|
||||||
|
|
||||||
enable = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Enable aiccu IPv6 over IPv4 SiXXs tunnel";
|
|
||||||
};
|
|
||||||
|
|
||||||
username = mkOption {
|
|
||||||
type = with types; nullOr str;
|
|
||||||
default = null;
|
|
||||||
example = "FAB5-SIXXS";
|
|
||||||
description = "Login credential";
|
|
||||||
};
|
|
||||||
|
|
||||||
password = mkOption {
|
|
||||||
type = with types; nullOr str;
|
|
||||||
default = null;
|
|
||||||
example = "TmAkRbBEr0";
|
|
||||||
description = "Login credential";
|
|
||||||
};
|
|
||||||
|
|
||||||
protocol = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "tic";
|
|
||||||
example = "tic|tsp|l2tp";
|
|
||||||
description = "Protocol to use for setting up the tunnel";
|
|
||||||
};
|
|
||||||
|
|
||||||
server = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "tic.sixxs.net";
|
|
||||||
example = "enabled.ipv6server.net";
|
|
||||||
description = "Server to use for setting up the tunnel";
|
|
||||||
};
|
|
||||||
|
|
||||||
interfaceName = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "aiccu";
|
|
||||||
example = "sixxs";
|
|
||||||
description = ''
|
|
||||||
The name of the interface that will be used as a tunnel interface.
|
|
||||||
On *BSD the ipv6_interface should be set to gifX (eg gif0) for proto-41 tunnels
|
|
||||||
or tunX (eg tun0) for AYIYA tunnels.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
tunnelID = mkOption {
|
|
||||||
type = with types; nullOr str;
|
|
||||||
default = null;
|
|
||||||
example = "T12345";
|
|
||||||
description = "The tunnel id to use, only required when there are multiple tunnels in the list";
|
|
||||||
};
|
|
||||||
|
|
||||||
verbose = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Be verbose?";
|
|
||||||
};
|
|
||||||
|
|
||||||
automatic = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Automatic Login and Tunnel activation";
|
|
||||||
};
|
|
||||||
|
|
||||||
requireTLS = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = ''
|
|
||||||
When set to true, if TLS is not supported on the server
|
|
||||||
the TIC transaction will fail.
|
|
||||||
When set to false, it will try a starttls, when that is
|
|
||||||
not supported it will continue.
|
|
||||||
In any case if AICCU is build with TLS support it will
|
|
||||||
try to do a 'starttls' to the TIC server to see if that
|
|
||||||
is supported.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
pidFile = mkOption {
|
|
||||||
type = types.path;
|
|
||||||
default = "/run/aiccu.pid";
|
|
||||||
example = "/var/lib/aiccu/aiccu.pid";
|
|
||||||
description = "Location of PID File";
|
|
||||||
};
|
|
||||||
|
|
||||||
defaultRoute = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Add a default route";
|
|
||||||
};
|
|
||||||
|
|
||||||
setupScript = mkOption {
|
|
||||||
type = with types; nullOr path;
|
|
||||||
default = null;
|
|
||||||
example = "/var/lib/aiccu/fix-subnets.sh";
|
|
||||||
description = "Script to run after setting up the interfaces";
|
|
||||||
};
|
|
||||||
|
|
||||||
makeHeartBeats = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = true;
|
|
||||||
description = ''
|
|
||||||
In general you don't want to turn this off
|
|
||||||
Of course only applies to AYIYA and heartbeat tunnels not to static ones
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
noConfigure = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Don't configure anything";
|
|
||||||
};
|
|
||||||
|
|
||||||
behindNAT = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Notify the user that a NAT-kind network is detected";
|
|
||||||
};
|
|
||||||
|
|
||||||
localIPv4Override = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = ''
|
|
||||||
Overrides the IPv4 parameter received from TIC
|
|
||||||
This allows one to configure a NAT into "DMZ" mode and then
|
|
||||||
forwarding the proto-41 packets to an internal host.
|
|
||||||
|
|
||||||
This is only needed for static proto-41 tunnels!
|
|
||||||
AYIYA and heartbeat tunnels don't require this.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
|
|
||||||
systemd.services.aiccu = {
|
|
||||||
description = "Automatic IPv6 Connectivity Client Utility";
|
|
||||||
after = [ "network.target" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
ExecStart = "${pkgs.aiccu}/bin/aiccu start ${configFile}";
|
|
||||||
ExecStop = "${pkgs.aiccu}/bin/aiccu stop";
|
|
||||||
Type = "forking";
|
|
||||||
PIDFile = cfg.pidFile;
|
|
||||||
Restart = "no"; # aiccu startup errors are serious, do not pound the tic server or be banned.
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
{ stdenv, fetchurl, gnutls, iproute, makeWrapper }:
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
|
|
||||||
name = "aiccu-${version}";
|
|
||||||
version = "20070115";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "http://http.debian.net/debian/pool/main/a/aiccu/aiccu_20070115.orig.tar.gz";
|
|
||||||
sha256 = "1k73vw7i25qzmnbvmsp3ci4pm6h8q70w70vnr512517s2q5gag6j";
|
|
||||||
};
|
|
||||||
|
|
||||||
buildInputs = [ gnutls iproute makeWrapper ];
|
|
||||||
|
|
||||||
patches = [
|
|
||||||
(fetchurl {
|
|
||||||
url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk/gnutls-3.4.0.patch?h=packages/aiccu&id=cc6decc4e734420e4c5d0cd28652077f6bd88d84";
|
|
||||||
sha256 = "1ni3lhwy3r54js124p7fhm1my82a703chvh07vrhslb4v4b71g5s";
|
|
||||||
name = "gnutls-3.4.0.patch";
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
configureFlags = "--prefix=$out";
|
|
||||||
installPhase = ''
|
|
||||||
install -D -m 755 unix-console/aiccu $out/bin/aiccu
|
|
||||||
install -D -m 644 doc/aiccu.sgml $out/doc/aiccu.sgml
|
|
||||||
install -D -m 644 doc/aiccu.1 $out/share/man/man1/aiccu.1
|
|
||||||
wrapProgram "$out/bin/aiccu" \
|
|
||||||
--prefix PATH : "${iproute}/bin"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
description = "Automatic IPv6 Connectivity Configuration Utility";
|
|
||||||
homepage = "https://www.sixxs.net/tools/aiccu/";
|
|
||||||
longDescription = ''
|
|
||||||
A TIC+ heartbeart client for the public dynamic-IPv4 IPv6 tunnel beta test from the SixXS tunnel service provider.
|
|
||||||
'';
|
|
||||||
maintainers = with maintainers; [ edwtjo ];
|
|
||||||
license = "SixXS";
|
|
||||||
platforms = with platforms; linux;
|
|
||||||
};
|
|
||||||
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue