diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 789faea9197..d6c65251c62 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -850,7 +850,6 @@ ./services/networking/ofono.nix ./services/networking/oidentd.nix ./services/networking/onedrive.nix - ./services/networking/openfire.nix ./services/networking/openvpn.nix ./services/networking/ostinato.nix ./services/networking/owamp.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 195cf87e6a8..72395b2ee86 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -91,6 +91,7 @@ with lib; (mkRemovedOptionModule [ "services" "shellinabox" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "gogoclient" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "virtuoso" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "openfire" ] "The corresponding package was removed from nixpkgs.") # Do NOT add any option renames here, see top of the file ]; diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix deleted file mode 100644 index fe0499d5232..00000000000 --- a/nixos/modules/services/networking/openfire.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -{ - ###### interface - - options = { - - services.openfire = { - - enable = mkEnableOption "OpenFire XMPP server"; - - usePostgreSQL = mkOption { - type = types.bool; - default = true; - description = " - Whether you use PostgreSQL service for your storage back-end. - "; - }; - - }; - - }; - - - ###### implementation - - config = mkIf config.services.openfire.enable { - - assertions = singleton - { assertion = !(config.services.openfire.usePostgreSQL -> config.services.postgresql.enable); - message = "OpenFire configured to use PostgreSQL but services.postgresql.enable is not enabled."; - }; - - systemd.services.openfire = { - description = "OpenFire XMPP server"; - wantedBy = [ "multi-user.target" ]; - after = [ "networking.target" ] ++ - optional config.services.openfire.usePostgreSQL "postgresql.service"; - path = with pkgs; [ jre openfire coreutils which gnugrep gawk gnused ]; - script = '' - export HOME=/tmp - mkdir /var/log/openfire || true - mkdir /etc/openfire || true - for i in ${pkgs.openfire}/conf.inst/*; do - if ! test -f /etc/openfire/$(basename $i); then - cp $i /etc/openfire/ - fi - done - openfire start - ''; # */ - }; - }; - -} diff --git a/pkgs/servers/xmpp/openfire/default.nix b/pkgs/servers/xmpp/openfire/default.nix deleted file mode 100644 index a655f1c348f..00000000000 --- a/pkgs/servers/xmpp/openfire/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, jre }: - -stdenv.mkDerivation rec { - pname = "openfire"; - version = "3_6_3"; - - src = fetchurl { - url = "http://www.igniterealtime.org/downloadServlet?filename=openfire/openfire_${version}.tar.gz"; - sha256 = "0ibzhmh9qw4lmx45ir1i280p30npgwnj7vrkl432kj3zi7hp79q2"; - }; - - buildInputs = [ jre ]; - - installPhase = '' - sed -e 's@\(common_jvm_locations=\).*@\1${jre}@' -i bin/openfire - cp -r . $out - rm -r $out/logs - mv $out/conf $out/conf.inst - ln -s /var/log/openfire $out/logs - ln -s /etc/openfire $out/conf - ''; - - meta = { - description = "XMPP server in Java"; - platforms = lib.platforms.unix; - # Some security advisories seem to apply, and each next version wants to - # write into larger parts of installation directory; installation is just - # unpacking, though - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35a2b85d0e3..ec031da6644 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21974,8 +21974,6 @@ with pkgs; oidentd = callPackage ../servers/identd/oidentd { }; - openfire = callPackage ../servers/xmpp/openfire { }; - softether = callPackage ../servers/softether { }; qboot = pkgsi686Linux.callPackage ../applications/virtualization/qboot { };