X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fpackages.nix;h=b66ebb27d147305ffbbdd87a1bc5354618e1eb30;hb=50d8fa14e0a4300960b3e5648349777e1e3ddecc;hp=05b0e88f3e89b2aa3b2f76ed42671b513cce3d51;hpb=dc10144003f159e8de99c82f4195587fef64cd46;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/packages.nix b/virtual/packages.nix
index 05b0e88..b66ebb2 100644
--- a/virtual/packages.nix
+++ b/virtual/packages.nix
@@ -1,94 +1,19 @@
 with import ../libs.nix;
 with nixpkgs_unstable;
 let
-  adminer = rec {
-    webRoot = pkgs.stdenv.mkDerivation rec {
-      version = "4.7.0";
-      name = "adminer-${version}";
-      src = pkgs.fetchurl {
-        url = "https://www.adminer.org/static/download/${version}/${name}.php";
-        sha256 = "1qq2g7rbfh2vrqfm3g0bz0qs057b049n0mhabnsbd1sgnpvnc5z7";
-      };
-      phases = "installPhase";
-      installPhase = ''
-        mkdir -p $out
-        cp $src $out/index.php
-      '';
-    };
-    phpFpm = rec {
-      socket = "/var/run/phpfpm/adminer.sock";
-      pool = ''
-        listen = ${socket}
-        user = ${apache.user}
-        group = ${apache.group}
-        listen.owner = ${apache.user}
-        listen.group = ${apache.group}
-        pm = ondemand
-        pm.max_children = 5
-        pm.process_idle_timeout = 60
-        ;php_admin_flag[log_errors] = on
-        php_admin_value[open_basedir] = "${webRoot}:/tmp"
-        '';
-    };
-    apache = {
-      user = "wwwrun";
-      group = "wwwrun";
-      modules = [ "proxy_fcgi" ];
-      vhostConf = ''
-        Alias /adminer ${webRoot}
-        <Directory ${webRoot}>
-          DirectoryIndex = index.php
-          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
-          </FilesMatch>
-        </Directory>
-        '';
-    };
-    nginxConf = {
-      alias = webRoot;
-      index = "index.php";
-      extraConfig = ''
-        include ${pkgs.nginx}/conf/fastcgi.conf;
-        fastcgi_split_path_info ^(.+?\.php)(/.*)$;
-        fastcgi_param HTTP_PROXY "";
-        fastcgi_param SCRIPT_FILENAME ${webRoot}/index.php;
-        fastcgi_pass unix:${phpFpm.socket};
-        fastcgi_index index.php;
-        fastcgi_intercept_errors on;
-        '';
-    };
-  };
-
-  ympd = rec {
-    config = {
-      webPort = "localhost:18001";
-      mpd = {
-        host = "malige.home.immae.eu";
-        port = 6600;
-      };
-    };
-    apache = {
-      vhostConf = ''
-        <LocationMatch "^/mpd">
-          Use LDAPConnect
-          Require ldap-group   cn=users,cn=mpd,ou=services,dc=immae,dc=eu
-          Require local
-        </LocationMatch>
-
-        RedirectMatch permanent "^/mpd$" "/mpd/"
-        <Location "/mpd/">
-          ProxyPass http://${config.webPort}/
-          ProxyPassReverse http://${config.webPort}/
-          ProxyPreserveHost on
-        </Location>
-        <Location "/mpd/ws">
-          ProxyPass ws://${config.webPort}/ws
-        </Location>
-      '';
-    };
-  };
+  connexionswing = import ./packages/connexionswing.nix;
+  nextcloud = import ./packages/nextcloud.nix;
+  adminer = import ./packages/adminer.nix;
+  ympd = import ./packages/ympd.nix;
+  gitweb = import ./packages/gitweb.nix;
+  mantisbt = import ./packages/mantisbt.nix;
 in
   {
     inherit adminer;
     inherit ympd;
+    connexionswing_dev  = connexionswing { environment = "dev"; };
+    connexionswing_prod = connexionswing { environment = "prod"; };
+    inherit nextcloud;
+    inherit mantisbt;
+    git = { web = gitweb; };
   }