summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2019-06-15 13:08:48 +0200
committerGitHub <noreply@github.com>2019-06-15 13:08:48 +0200
commit395da1280e8146e47eb0dc1c9bc10284fe0334f1 (patch)
tree12053b9a3344c9fa6f01f68ac85657e50ca9f91a /nixos
parent3a61b882690c949773fea6cecb1fc961f9119edd (diff)
parent3fabe1accbf44059caa05790c2d1afa0f32dd447 (diff)
downloadnixpkgs-395da1280e8146e47eb0dc1c9bc10284fe0334f1.tar
nixpkgs-395da1280e8146e47eb0dc1c9bc10284fe0334f1.tar.gz
nixpkgs-395da1280e8146e47eb0dc1c9bc10284fe0334f1.tar.bz2
nixpkgs-395da1280e8146e47eb0dc1c9bc10284fe0334f1.tar.lz
nixpkgs-395da1280e8146e47eb0dc1c9bc10284fe0334f1.tar.xz
nixpkgs-395da1280e8146e47eb0dc1c9bc10284fe0334f1.tar.zst
nixpkgs-395da1280e8146e47eb0dc1c9bc10284fe0334f1.zip
Merge pull request #63100 from aanderse/phabricator-remove
drop unmaintained phabricator package, service, and httpd subservice
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-1909.xml6
-rw-r--r--nixos/modules/module-list.nix1
-rw-r--r--nixos/modules/services/misc/phd.nix52
-rw-r--r--nixos/modules/services/web-servers/apache-httpd/phabricator.nix50
-rw-r--r--nixos/tests/phabricator.nix77
5 files changed, 6 insertions, 180 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1909.xml b/nixos/doc/manual/release-notes/rl-1909.xml
index b92cefa441d..2a3e565a6f6 100644
--- a/nixos/doc/manual/release-notes/rl-1909.xml
+++ b/nixos/doc/manual/release-notes/rl-1909.xml
@@ -283,6 +283,12 @@
       so you'll need to set <option>hardware.pulseaudio.daemon.config.resample-method</option> back to <literal>speex-float-1</literal>.
     </para>
    </listitem>
+   <listitem>
+    <para>
+     The <literal>phabricator</literal> package and associated <literal>httpd.extraSubservice</literal>, as well as the
+     <literal>phd</literal> service have been removed from nixpkgs due to lack of maintainer.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index bb33d8e6d95..50e3078d977 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -444,7 +444,6 @@
   ./services/misc/packagekit.nix
   ./services/misc/paperless.nix
   ./services/misc/parsoid.nix
-  ./services/misc/phd.nix
   ./services/misc/plex.nix
   ./services/misc/tautulli.nix
   ./services/misc/pykms.nix
diff --git a/nixos/modules/services/misc/phd.nix b/nixos/modules/services/misc/phd.nix
deleted file mode 100644
index e605ce5de16..00000000000
--- a/nixos/modules/services/misc/phd.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  cfg = config.services.phd;
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    services.phd = {
-
-      enable = mkOption {
-        default = false;
-        description = "
-          Enable daemons for phabricator.
-        ";
-      };
-
-    };
-
-  };
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-
-    systemd.services.phd = {
-      path = [ pkgs.phabricator pkgs.php pkgs.mercurial pkgs.git pkgs.subversion ];
-
-      after = [ "httpd.service" ];
-      wantedBy = [ "multi-user.target" ];
-
-      serviceConfig = {
-        ExecStart = "${pkgs.phabricator}/phabricator/bin/phd start";
-        ExecStop = "${pkgs.phabricator}/phabricator/bin/phd stop";
-        User = "wwwrun";
-        RestartSec = "30s";
-        Restart = "always";
-        StartLimitInterval = "1m";
-      };
-    };
-
-  };
-
-}
diff --git a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
deleted file mode 100644
index efd4a7b5f0f..00000000000
--- a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  phabricatorRoot = pkgs.phabricator;
-in {
-
-  enablePHP = true;
-  extraApacheModules = [ "mod_rewrite" ];
-  DocumentRoot = "${phabricatorRoot}/phabricator/webroot";
-
-  options = {
-      git = mkOption {
-          default = true;
-          description = "Enable git repositories.";
-      };
-      mercurial = mkOption {
-          default = true;
-          description = "Enable mercurial repositories.";
-      };
-      subversion = mkOption {
-          default = true;
-          description = "Enable subversion repositories.";
-      };
-  };
-
-  extraConfig = ''
-      DocumentRoot ${phabricatorRoot}/phabricator/webroot
-
-      RewriteEngine on
-      RewriteRule ^/rsrc/(.*) - [L,QSA]
-      RewriteRule ^/favicon.ico - [L,QSA]
-      RewriteRule ^(.*)$ /index.php?__path__=$1 [B,L,QSA]
-  '';
-
-  extraServerPath = [
-      "${pkgs.which}"
-      "${pkgs.diffutils}"
-      ] ++
-      (if config.mercurial then ["${pkgs.mercurial}"] else []) ++
-      (if config.subversion then ["${pkgs.subversion.out}"] else []) ++
-      (if config.git then ["${pkgs.git}"] else []);
-
-  startupScript = pkgs.writeScript "activatePhabricator" ''
-      mkdir -p /var/repo
-      chown wwwrun /var/repo
-  '';
-
-}
diff --git a/nixos/tests/phabricator.nix b/nixos/tests/phabricator.nix
deleted file mode 100644
index db23331842c..00000000000
--- a/nixos/tests/phabricator.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-import ./make-test.nix ({ pkgs, ... }: {
-  name = "phabricator";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ ];
-  };
-
-  nodes = {
-    storage =
-      { ... }:
-      { services.nfs.server.enable = true;
-        services.nfs.server.exports = ''
-          /repos 192.168.1.0/255.255.255.0(rw,no_root_squash)
-        '';
-        services.nfs.server.createMountPoints = true;
-      };
-
-    webserver =
-      { pkgs, ... }:
-      { fileSystems = pkgs.lib.mkVMOverride
-          [ { mountPoint = "/repos";
-              device = "storage:/repos";
-              fsType = "nfs";
-            }
-          ];
-        networking.firewall.enable = false;
-        networking.useDHCP = false;
-
-        services = {
-          httpd = {
-            enable = true;
-            adminAddr = "root@localhost";
-            virtualHosts = [{
-              hostName = "phabricator.local";
-              extraSubservices = [{serviceType = "phabricator";}];
-            }];
-          };
-
-          phd = {
-            enable = true;
-          };
-
-          mysql = {
-            enable = true;
-            package = pkgs.mysql;
-            extraOptions = ''
-              sql_mode=STRICT_ALL_TABLES
-            '';
-          };
-        };
-
-        environment.systemPackages = [ pkgs.php ];
-      };
-
-    client =
-      { ... }:
-      { imports = [ ./common/x11.nix ];
-        services.xserver.desktopManager.plasma5.enable = true;
-      };
-  };
-
-  testScript =
-    ''
-      startAll;
-
-      $client->waitForX;
-
-      $webserver->waitForUnit("mysql");
-      $webserver->waitForUnit("httpd");
-      $webserver->execute("cd /nix/store; less >/repos/log1");
-
-      $client->sleep(30); # loading takes a long time
-      $client->execute("konqueror http://webserver/ &");
-      $client->sleep(90); # loading takes a long time
-
-      $client->screenshot("screen");
-    '';
-})