diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-07-20 21:06:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-20 21:06:32 +0200 |
| commit | 1a6af9f88ec2405334a9fd6a977ccbcb53472305 (patch) | |
| tree | 4976952d82daa3fb817193170299fd6f50c6c6d1 /nixos/modules/services/web-servers | |
| parent | ce12ad31169edfb1de911e54be9230b298e325f3 (diff) | |
| parent | 87f5930c3fb2c852f5243278b7a9da8e117d95e4 (diff) | |
| download | nixlib-1a6af9f88ec2405334a9fd6a977ccbcb53472305.tar nixlib-1a6af9f88ec2405334a9fd6a977ccbcb53472305.tar.gz nixlib-1a6af9f88ec2405334a9fd6a977ccbcb53472305.tar.bz2 nixlib-1a6af9f88ec2405334a9fd6a977ccbcb53472305.tar.lz nixlib-1a6af9f88ec2405334a9fd6a977ccbcb53472305.tar.xz nixlib-1a6af9f88ec2405334a9fd6a977ccbcb53472305.tar.zst nixlib-1a6af9f88ec2405334a9fd6a977ccbcb53472305.zip | |
Merge pull request #43857 from volth/unused
[bot] treewide: remove unreferenced code
Diffstat (limited to 'nixos/modules/services/web-servers')
4 files changed, 0 insertions, 22 deletions
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index eb8ee9b5cf46..73607c6f9a3b 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -98,11 +98,6 @@ let allSubservices = mainSubservices ++ concatMap subservicesFor mainCfg.virtualHosts; - # !!! should be in lib - writeTextInDir = name: text: - pkgs.runCommand name {inherit text;} "mkdir -p $out; echo -n \"$text\" > $out/$name"; - - enableSSL = any (vhost: vhost.enableSSL) allHosts; diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix index 82b8bf3e30db..6345a9a56935 100644 --- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix +++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix @@ -4,17 +4,6 @@ with lib; let - httpd = serverInfo.serverConfig.package; - - version24 = !versionOlder httpd.version "2.4"; - - allGranted = if version24 then '' - Require all granted - '' else '' - Order allow,deny - Allow from all - ''; - owncloudConfig = pkgs.writeText "config.php" '' <?php diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix index 35b9ab56087c..28b411a64b6f 100644 --- a/nixos/modules/services/web-servers/apache-httpd/trac.nix +++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix @@ -12,8 +12,6 @@ let apacheHttpd = httpd; }; - pythonLib = p: "${p}/"; - httpd = serverInfo.serverConfig.package; versionPre24 = versionOlder httpd.version "2.4"; diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 3ef78ea77cb2..3f858d90fa46 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -27,10 +27,6 @@ let else if hasPython3 then uwsgi.python3 else null; - pythonPackages = pkgs.pythonPackages.override { - inherit python; - }; - pythonEnv = python.withPackages (c.pythonPackages or (self: [])); uwsgiCfg = { |