Add opendmarc openarc and opendkim configuration and packages

diff --git a/modules/default.nix b/modules/default.nix
index dd34870235f99c58ffa6dd8dba818ab346cc340d..53469562a298a46356ebbf679b6ff681c4460707 100644 (file)
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -10,6 +10,9 @@
   mediagoblin = ./webapps/mediagoblin.nix;
   peertube = ./webapps/peertube.nix;
 
+  opendmarc = ./opendmarc.nix;
+  openarc = ./openarc.nix;
+
   php-application = ./websites/php-application.nix;
   websites = ./websites;
 } // (if builtins.pathExists ./private then import ./private else {})

diff --git a/modules/myids.nix b/modules/myids.nix
index 4fb26269a11dfb98767498edaa53c316b438f72b..7ec9c0efc5e595d7f591f3ed6ce1c9c851692a05 100644 (file)
--- a/modules/myids.nix
+++ b/modules/myids.nix
@@ -3,6 +3,8 @@
   # Check that there is no clash with nixos/modules/misc/ids.nix
   config = {
     ids.uids = {
+      opendarc = 391;
+      opendmarc = 392;
       peertube = 394;
       redis = 395;
       nullmailer = 396;
@@ -11,6 +13,8 @@
       mastodon = 399;
     };
     ids.gids = {
+      opendarc = 392;
+      opendmarc = 392;
       peertube = 394;
       redis = 395;
       nullmailer = 396;

diff --git a/modules/openarc.nix b/modules/openarc.nix
new file mode 100644 (file)
index 0000000..9dc49de
--- /dev/null
+++ b/modules/openarc.nix
@@ -0,0 +1,90 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.openarc;
+
+  defaultSock = "local:/run/openarc/openarc.sock";
+
+  args = [ "-f"
+           "-p" cfg.socket
+         ] ++ optionals (cfg.configFile != null) [ "-c" cfg.configFile ];
+
+in {
+
+  ###### interface
+
+  options = {
+
+    services.openarc = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the OpenARC sender authentication system.";
+      };
+
+      socket = mkOption {
+        type = types.str;
+        default = defaultSock;
+        description = "Socket which is used for communication with OpenARC.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "opendmarc";
+        description = "User for the daemon.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "opendmarc";
+        description = "Group for the daemon.";
+      };
+
+      configFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = "Additional OpenARC configuration.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.users = optionalAttrs (cfg.user == "openarc") (singleton
+      { name = "openarc";
+        group = cfg.group;
+        uid = config.ids.uids.openarc;
+      });
+
+    users.groups = optionalAttrs (cfg.group == "openarc") (singleton
+      { name = "openarc";
+        gid = config.ids.gids.openarc;
+      });
+
+    environment.systemPackages = [ pkgs.openarc ];
+
+    systemd.services.openarc = {
+      description = "OpenARC daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.openarc}/bin/openarc ${escapeShellArgs args}";
+        User = cfg.user;
+        Group = cfg.group;
+        RuntimeDirectory = optional (cfg.socket == defaultSock) "openarc";
+        PermissionsStartOnly = true;
+      };
+    };
+
+  };
+}

diff --git a/modules/opendmarc.nix b/modules/opendmarc.nix
new file mode 100644 (file)
index 0000000..e18ec82
--- /dev/null
+++ b/modules/opendmarc.nix
@@ -0,0 +1,90 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.opendmarc;
+
+  defaultSock = "local:/run/opendmarc/opendmarc.sock";
+
+  args = [ "-f" "-l"
+           "-p" cfg.socket
+         ] ++ optionals (cfg.configFile != null) [ "-c" cfg.configFile ];
+
+in {
+
+  ###### interface
+
+  options = {
+
+    services.opendmarc = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether to enable the OpenDMARC sender authentication system.";
+      };
+
+      socket = mkOption {
+        type = types.str;
+        default = defaultSock;
+        description = "Socket which is used for communication with OpenDMARC.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "opendmarc";
+        description = "User for the daemon.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "opendmarc";
+        description = "Group for the daemon.";
+      };
+
+      configFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = "Additional OpenDMARC configuration.";
+      };
+
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.users = optionalAttrs (cfg.user == "opendmarc") (singleton
+      { name = "opendmarc";
+        group = cfg.group;
+        uid = config.ids.uids.opendmarc;
+      });
+
+    users.groups = optionalAttrs (cfg.group == "opendmarc") (singleton
+      { name = "opendmarc";
+        gid = config.ids.gids.opendmarc;
+      });
+
+    environment.systemPackages = [ pkgs.opendmarc ];
+
+    systemd.services.opendmarc = {
+      description = "OpenDMARC daemon";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        ExecStart = "${pkgs.opendmarc}/bin/opendmarc ${escapeShellArgs args}";
+        User = cfg.user;
+        Group = cfg.group;
+        RuntimeDirectory = optional (cfg.socket == defaultSock) "opendmarc";
+        PermissionsStartOnly = true;
+      };
+    };
+
+  };
+}

diff --git a/pkgs/default.nix b/pkgs/default.nix
index c91f67262fb411a2d9f6ab2cbd119c9e80d43172..74f9d184b2703cee2d97f7f069dbe669ad567eee 100644 (file)
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -18,6 +18,8 @@ rec {
   notmuch-python2 = callPackage ../pkgs/notmuch/notmuch-python { pythonPackages = python2Packages; };
   notmuch-python3 = callPackage ../pkgs/notmuch/notmuch-python { pythonPackages = python3Packages; };
   notmuch-vim = callPackage ../pkgs/notmuch/notmuch-vim {};
+  openarc = callPackage ../pkgs/openarc { inherit mylibs; };
+  opendmarc = callPackage ../pkgs/opendmarc { libspf2 = callPackage ../pkgs/opendmarc/libspf2.nix {}; };
   pg_activity = callPackage ../pkgs/pg_activity { inherit mylibs; };
   pgloader = callPackage ../pkgs/pgloader {};
   telegram-cli = callPackage ../pkgs/telegram-cli { inherit mylibs; };

diff --git a/pkgs/openarc/default.nix b/pkgs/openarc/default.nix
new file mode 100644 (file)
index 0000000..e5c9a81
--- /dev/null
+++ b/pkgs/openarc/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, autoconf, automake, file, libtool, libbsd, mylibs, openssl, pkg-config, libmilter }:
+
+stdenv.mkDerivation (mylibs.fetchedGithub ./openarc.json // rec {
+  buildInputs = [ automake autoconf libbsd libtool openssl pkg-config libmilter ];
+
+  configureFlags = [
+    "--with-milter=${libmilter}"
+  ];
+  preConfigure = ''
+    autoreconf --force --install
+    sed -i -e "s@/usr/bin/file@${file}/bin/file@" ./configure
+    '';
+  meta = with stdenv.lib; {
+    description = "Open source ARC implementation";
+    homepage = https://github.com/trusteddomainproject/OpenARC;
+    platforms = platforms.unix;
+  };
+})

diff --git a/pkgs/openarc/openarc.json b/pkgs/openarc/openarc.json
new file mode 100644 (file)
index 0000000..1081b09
--- /dev/null
+++ b/pkgs/openarc/openarc.json
@@ -0,0 +1,15 @@
+{
+  "tag": "355ee2a-master",
+  "meta": {
+    "name": "openarc",
+    "url": "https://github.com/trusteddomainproject/OpenARC",
+    "branch": "master"
+  },
+  "github": {
+    "owner": "trusteddomainproject",
+    "repo": "OpenARC",
+    "rev": "355ee2a1ca85acccce494478991983b54f794f4e",
+    "sha256": "0101k6hwwf3pb3jrc88x86d4l698gjmynn9v2rpvxwxv200r2i65",
+    "fetchSubmodules": true
+  }
+}

diff --git a/pkgs/opendmarc/default.nix b/pkgs/opendmarc/default.nix
new file mode 100644 (file)
index 0000000..1c50248
--- /dev/null
+++ b/pkgs/opendmarc/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, pkgconfig, libbsd, openssl, libmilter , perl, makeWrapper, libspf2 }:
+
+stdenv.mkDerivation rec {
+  name = "opendmarc-${version}";
+  version = "1.3.2";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/opendmarc/files/${name}.tar.gz";
+    sha256 = "1yrggj8yq0915y2i34gfz2xpl1w2lgb1vggp67rwspgzm40lng11";
+  };
+
+  configureFlags= [
+    "--with-spf"
+    "--with-spf2-include=${libspf2}/include/spf2"
+    "--with-spf2-lib=${libspf2}/lib/"
+    "--with-milter=${libmilter}"
+  ];
+
+  buildInputs = [ libspf2 libbsd openssl libmilter perl ];
+
+  meta = with stdenv.lib; {
+    description = "Free open source software implementation of the DMARC specification";
+    homepage = http://www.trusteddomain.org/opendmarc/;
+    platforms = platforms.unix;
+  };
+}

diff --git a/pkgs/opendmarc/libspf2.nix b/pkgs/opendmarc/libspf2.nix
new file mode 100644 (file)
index 0000000..ca02d59
--- /dev/null
+++ b/pkgs/opendmarc/libspf2.nix
@@ -0,0 +1,35 @@
+{ stdenv, file, fetchurl, fetchpatch, libnsl }:
+
+stdenv.mkDerivation rec {
+  name = "libspf2-${version}";
+  version = "1.2.10";
+
+  patches = [
+    (fetchpatch {
+      name = "fix-variadic-macros.patch";
+      url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/fix-variadic-macros.patch?h=packages/libspf2";
+      sha256 = "00dqpcgjr9jy2qprgqv2qiyvq8y3wlz4yns9xzabf2064jzqh2ic";
+    })
+  ];
+  preConfigure = ''
+    sed -i -e "s@/usr/bin/file@${file}/bin/file@" ./configure
+    '';
+  configureFlags = [
+    "--enable-static"
+  ];
+  postInstall = ''
+    rm $out/bin/*_static
+    '';
+  src = fetchurl {
+    url = "https://www.libspf2.org/spf/${name}.tar.gz";
+    sha256 = "1j91p0qiipzf89qxq4m1wqhdf01hpn1h5xj4djbs51z23bl3s7nr";
+  };
+
+  buildInputs = [ libnsl ];
+
+  meta = with stdenv.lib; {
+    description = "Sender Policy Framework record checking library";
+    homepage = https://www.libspf2.org/;
+    platforms = platforms.unix;
+  };
+}