about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorajs124 <git@ajs124.de>2021-12-15 17:56:08 +0000
committerajs124 <git@ajs124.de>2022-01-26 01:12:39 +0100
commit737de29e11d8fcf329e46879d4d0d0c33cdc6ac8 (patch)
tree1564e997714d0a6f2e8a4a7715df203f7207ef3a /nixos
parentb5f5cc6d4417391394c7b513bf45a171a1b99c9b (diff)
downloadnixlib-737de29e11d8fcf329e46879d4d0d0c33cdc6ac8.tar
nixlib-737de29e11d8fcf329e46879d4d0d0c33cdc6ac8.tar.gz
nixlib-737de29e11d8fcf329e46879d4d0d0c33cdc6ac8.tar.bz2
nixlib-737de29e11d8fcf329e46879d4d0d0c33cdc6ac8.tar.lz
nixlib-737de29e11d8fcf329e46879d4d0d0c33cdc6ac8.tar.xz
nixlib-737de29e11d8fcf329e46879d4d0d0c33cdc6ac8.tar.zst
nixlib-737de29e11d8fcf329e46879d4d0d0c33cdc6ac8.zip
nixos/racoon: drop
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/rename.nix3
-rw-r--r--nixos/modules/services/networking/racoon.nix45
3 files changed, 3 insertions, 46 deletions
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4b2cb803e20e..c2b1e8866863 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -852,7 +852,6 @@
   ./services/networking/quassel.nix
   ./services/networking/quorum.nix
   ./services/networking/quicktun.nix
-  ./services/networking/racoon.nix
   ./services/networking/radicale.nix
   ./services/networking/radvd.nix
   ./services/networking/rdnssd.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index b9a2f47f3f5a..81843dc0f90a 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -80,6 +80,9 @@ with lib;
       libinput and synaptics.
     '')
     (mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream")
+    (mkRemovedOptionModule [ "services" "racoon" ] ''
+      The racoon module has been removed, because the software project was abandoned upstream.
+    '')
 
     # Do NOT add any option renames here, see top of the file
   ];
diff --git a/nixos/modules/services/networking/racoon.nix b/nixos/modules/services/networking/racoon.nix
deleted file mode 100644
index 328f4cb1497f..000000000000
--- a/nixos/modules/services/networking/racoon.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.racoon;
-in {
-  options.services.racoon = {
-    enable = mkEnableOption "racoon";
-
-    config = mkOption {
-      description = "Contents of racoon configuration file.";
-      default = "";
-      type = types.str;
-    };
-
-    configPath = mkOption {
-      description = "Location of racoon config if config is not provided.";
-      default = "/etc/racoon/racoon.conf";
-      type = types.path;
-    };
-  };
-
-  config = mkIf cfg.enable {
-    systemd.services.racoon = {
-      description = "Racoon Daemon";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.ipsecTools}/bin/racoon -f ${
-          if (cfg.config != "") then pkgs.writeText "racoon.conf" cfg.config
-          else cfg.configPath
-        }";
-        ExecReload = "${pkgs.ipsecTools}/bin/racoonctl reload-config";
-        PIDFile = "/run/racoon.pid";
-        Type = "forking";
-        Restart = "always";
-      };
-      preStart = ''
-        rm /run/racoon.pid || true
-        mkdir -p /var/racoon
-      '';
-    };
-  };
-}