From e8c6fd753506290264097718f137c1764200ae14 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Thu, 26 Jul 2018 15:32:22 +0200 Subject: [PATCH] =?UTF-8?q?D=C3=A9sactivation=20Organizr?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- overlays/organizr.nix | 5 ----- pkgs/organizr/default.nix | 26 ----------------------- systems/LoutreOS/configuration.nix | 1 - systems/LoutreOS/services.nix | 34 ------------------------------ 4 files changed, 66 deletions(-) delete mode 100644 overlays/organizr.nix delete mode 100644 pkgs/organizr/default.nix diff --git a/overlays/organizr.nix b/overlays/organizr.nix deleted file mode 100644 index c43ba5c..0000000 --- a/overlays/organizr.nix +++ /dev/null @@ -1,5 +0,0 @@ -self: super: - -{ - organizr = super.callPackage ../pkgs/organizr { }; -} diff --git a/pkgs/organizr/default.nix b/pkgs/organizr/default.nix deleted file mode 100644 index 5495f38..0000000 --- a/pkgs/organizr/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - name = "organizr-${version}"; - version = "1.75"; - - src = fetchFromGitHub { - owner = "causefx"; - repo = "Organizr"; - rev = version; - sha256 = "13h6cgqq3gyg5d3ikj7k85igpg6al7y9xdsxammkr8y5dzfbkm36"; - }; - - installPhase = '' - mkdir -p $out/ - cp -R . $out/ - ln -s /var/lib/organizr/config.php $out/config/config.php - ''; - - meta = { - description = "Organizr dashboard"; - homepage = https://github.com/causefx/Organizr; - license = stdenv.lib.licenses.gpl3; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/systems/LoutreOS/configuration.nix b/systems/LoutreOS/configuration.nix index 5427b59..1bb73da 100644 --- a/systems/LoutreOS/configuration.nix +++ b/systems/LoutreOS/configuration.nix @@ -39,7 +39,6 @@ nixpkgs.overlays = [ (import ../../overlays/riot-web.nix) (import ../../overlays/lidarr.nix) - (import ../../overlays/organizr.nix) (import ../../overlays/sudo.nix) (import ../../overlays/neovim.nix) (import ../../overlays/site-max.nix) diff --git a/systems/LoutreOS/services.nix b/systems/LoutreOS/services.nix index c713999..00c9415 100644 --- a/systems/LoutreOS/services.nix +++ b/systems/LoutreOS/services.nix @@ -6,7 +6,6 @@ let domaine = "nyanlout.re"; riot_port = 52345; - organizr_port = 52346; pgmanage_port = 52347; max_port = 52348; musique_port = 52349; @@ -48,7 +47,6 @@ in "searx.${domaine}" = { ip = "127.0.0.1"; port = 8888; auth = false; }; "riot.${domaine}" = { ip = "127.0.0.1"; port = riot_port; auth = false; }; "matrix.${domaine}" = { ip = "127.0.0.1"; port = 8008; auth = false; }; - "organizr.${domaine}" = { ip = "127.0.0.1"; port = organizr_port; auth = true; }; "pgmanage.${domaine}" = { ip = "127.0.0.1"; port = pgmanage_port; auth = true; }; "gitea.${domaine}" = { ip = "127.0.0.1"; port = 3001; auth = false; }; }; @@ -140,40 +138,8 @@ in listen = [ { addr = "127.0.0.1"; port = riot_port; } ]; locations = { "/" = { root = pkgs.riot-web; }; }; }; - "organizr" = { - listen = [ { addr = "127.0.0.1"; port = organizr_port; } ]; - locations."/" = { - root = pkgs.organizr; - index = "index.php"; - extraConfig = '' - location ~* \.php$ { - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:/run/phpfpm/nginx; - include ${pkgs.nginx}/conf/fastcgi_params; - include ${pkgs.nginx}/conf/fastcgi.conf; - } - ''; - }; - }; }; - services.phpfpm.poolConfigs.mypool = '' - listen = /run/phpfpm/nginx - listen.owner = nginx - listen.group = nginx - listen.mode = 0660 - user = nginx - pm = dynamic - pm.max_children = 75 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 20 - pm.max_requests = 500 - php_admin_value[error_log] = 'stderr' - php_admin_flag[log_errors] = on - catch_workers_output = yes - ''; - services.postgresql.enable = true; services.matrix-synapse = { enable = true;