-{ lib, pkgs, config, myconfig, mylibs, ... }:
+{ lib, pkgs, config, myconfig, ... }:
let
adminer = pkgs.callPackage ../commons/adminer.nix {};
tellesflorian_dev = pkgs.callPackage ./tellesflorian.nix {
- inherit (pkgs.private.webapps) tellesflorian;
+ inherit (pkgs.webapps) tellesflorian;
config = myconfig.env.websites.tellesflorian.integration;
};
config = lib.mkIf cfg.integration.enable {
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;
mkdir -p $out/webapps
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 = {
+ services.websites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules;
+ services.websites.integration.vhostConfs.tellesflorian = {
certName = "eldiron";
+ addToCerts = true;
hosts = ["app.tellesflorian.com" ];
root = tellesflorian_dev.apache.root;
extraConfig = [