-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, ... }:
let
- adminer = pkgs.callPackage ../commons/adminer.nix {};
+ adminer = pkgs.callPackage ../commons/adminer.nix {};
- tellesflorian = pkgs.callPackage ./tellesflorian.nix { inherit (mylibs) fetchedGitPrivate; };
- tellesflorian_dev = tellesflorian {
- config = myconfig.env.websites.tellesflorian.integration;
- };
+ tellesflorian_dev = pkgs.callPackage ./tellesflorian.nix {
+ inherit (pkgs.webapps) tellesflorian;
+ config = myconfig.env.websites.tellesflorian.integration;
+ };
- cfg = config.services.myWebsites.TellesFlorian;
+ cfg = config.services.myWebsites.TellesFlorian;
in {
options.services.myWebsites.TellesFlorian = {
integration = {
};
config = lib.mkIf cfg.integration.enable {
- deployment.keys = tellesflorian_dev.keys;
+ secrets.keys = tellesflorian_dev.keys;
security.acme.certs."eldiron".extraDomains."app.tellesflorian.com" = null;
+ services.myPhpfpm.preStart.tellesflorian_dev = tellesflorian_dev.phpFpm.preStart;
services.myPhpfpm.serviceDependencies.tellesflorian_dev = tellesflorian_dev.phpFpm.serviceDeps;
services.myPhpfpm.poolConfigs.tellesflorian_dev = tellesflorian_dev.phpFpm.pool;
system.activationScripts.tellesflorian_dev = tellesflorian_dev.activationScript;
system.extraSystemBuilderCmds = ''
mkdir -p $out/webapps
- ln -s ${tellesflorian_dev.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName}
+ ln -s ${tellesflorian_dev.app.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName}
'';
services.myWebsites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules;
services.myWebsites.integration.vhostConfs.tellesflorian = {