-{ 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 {
- inherit (mylibs) fetchedGithub;
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 {
- inherit (mylibs) fetchedGithub;
+ inherit (pkgs.webapps) rompr;
env = myconfig.env.tools.rompr;
};
shaarli = pkgs.callPackage ./shaarli.nix {
env = myconfig.env.tools.shaarli;
};
dokuwiki = pkgs.callPackage ./dokuwiki.nix {
- inherit (mylibs) fetchedGithub;
+ inherit (pkgs.webapps) dokuwiki dokuwiki-plugins;
};
ldap = pkgs.callPackage ./ldap.nix {
+ inherit (pkgs.webapps) phpldapadmin;
env = myconfig.env.tools.phpldapadmin;
};
security.acme.certs."eldiron".extraDomains."tools.immae.eu" = null;
security.acme.certs."eldiron".extraDomains."devtools.immae.eu" = null;
- deployment.keys =
+ secrets.keys =
kanboard.keys
- // ldap.keys
- // roundcubemail.keys
- // shaarli.keys
- // ttrss.keys
- // wallabag.keys
- // yourls.keys;
+ ++ ldap.keys
+ ++ roundcubemail.keys
+ ++ shaarli.keys
+ ++ ttrss.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
++ ldap.apache.modules
++ kanboard.apache.modules;
- services.ympd = ympd.config // { enable = true; };
+ systemd.services.ympd = {
+ description = "Standalone MPD Web GUI written in C";
+ wantedBy = [ "multi-user.target" ];
+ script = ''
+ export MPD_PASSWORD=$(cat /var/secrets/mpd)
+ ${pkgs.ympd}/bin/ympd --host ${ympd.config.host} --port ${toString ympd.config.port} --webport ${ympd.config.webPort} --user nobody
+ '';
+ };
- 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;
'';
roundcubemail = roundcubemail.phpFpm.phpConfig;
};
+ services.myPhpfpm.preStart = {
+ wallabag = wallabag.phpFpm.preStart;
+ };
services.myPhpfpm.poolConfigs = {
adminer = adminer.phpFpm.pool;
ttrss = ttrss.phpFpm.pool;
ln -s ${kanboard.webRoot} $out/webapps/${kanboard.apache.webappName}
'';
- nixpkgs.overlays = [ (self: super: rec {
- ympd = super.ympd.overrideAttrs(old: mylibs.fetchedGithub ./ympd.json);
- }) ];
-
systemd.services.tt-rss = {
description = "Tiny Tiny RSS feeds update daemon";
serviceConfig = {