-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, ... }:
let
adminer = pkgs.callPackage ../../commons/adminer.nix {};
ympd = pkgs.callPackage ./ympd.nix {
env = myconfig.env.tools.ympd;
};
ttrss = pkgs.callPackage ./ttrss.nix {
- inherit (mylibs) fetchedGithub fetchedGit;
+ inherit (pkgs.webapps) ttrss ttrss-plugins;
env = myconfig.env.tools.ttrss;
};
roundcubemail = pkgs.callPackage ./roundcubemail.nix {
- inherit (mylibs) fetchedGithub;
+ inherit (pkgs.webapps) roundcubemail roundcubemail-plugins roundcubemail-skins;
env = myconfig.env.tools.roundcubemail;
};
rainloop = pkgs.callPackage ./rainloop.nix {};
kanboard = pkgs.callPackage ./kanboard.nix {
env = myconfig.env.tools.kanboard;
};
- wallabag = pkgs.callPackage ./wallabag.nix { env = myconfig.env.tools.wallabag; };
+ wallabag = pkgs.callPackage ./wallabag.nix {
+ inherit (pkgs.webapps) wallabag;
+ env = myconfig.env.tools.wallabag;
+ };
yourls = pkgs.callPackage ./yourls.nix {
- inherit (mylibs) fetchedGithub;
+ inherit (pkgs.webapps) yourls yourls-plugins;
env = myconfig.env.tools.yourls;
};
rompr = pkgs.callPackage ./rompr.nix {
security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null;
security.acme.certs."eldiron".extraDomains."devtools.immae.eu" = null;
- mySecrets.keys =
+ secrets.keys =
kanboard.keys
++ ldap.keys
++ roundcubemail.keys
++ wallabag.keys
++ yourls.keys;
- services.myWebsites.integration.modules =
+ services.websites.integration.modules =
rainloop.apache.modules;
- services.myWebsites.tools.modules =
+ services.websites.tools.modules =
[ "proxy_fcgi" ]
++ adminer.apache.modules
++ ympd.apache.modules
'';
};
- services.myWebsites.integration.vhostConfs.devtools = {
+ services.websites.integration.vhostConfs.devtools = {
certName = "eldiron";
hosts = ["devtools.immae.eu" ];
root = "/var/lib/ftp/devtools.immae.eu";
];
};
- services.myWebsites.tools.vhostConfs.tools = {
+ services.websites.tools.vhostConfs.tools = {
certName = "eldiron";
hosts = ["tools.immae.eu" ];
root = "/var/lib/ftp/tools.immae.eu";
};
security.acme.certs."eldiron".extraDomains."outils.immae.eu" = null;
- services.myWebsites.tools.vhostConfs.outils = {
+ services.websites.tools.vhostConfs.outils = {
certName = "eldiron";
hosts = [ "outils.immae.eu" ];
root = null;