From 4288c2f2431fb782b0d512b1b3749187f2374b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 22 May 2019 20:01:33 +0200 Subject: Move websites/tools to modules --- modules/private/websites/florian/app.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'modules/private/websites/florian') diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix index 905c66a..3a6d152 100644 --- a/modules/private/websites/florian/app.nix +++ b/modules/private/websites/florian/app.nix @@ -20,10 +20,7 @@ in { systemd.services.phpfpm-tellesflorian_dev.preStart = lib.mkAfter tellesflorian.phpFpm.preStart; services.phpfpm.poolConfigs.tellesflorian_dev = tellesflorian.phpFpm.pool; system.activationScripts.tellesflorian_dev = tellesflorian.activationScript; - system.extraSystemBuilderCmds = '' - mkdir -p $out/webapps - ln -s ${tellesflorian.app.webRoot} $out/webapps/${tellesflorian.apache.webappName} - ''; + myServices.websites.webappDirs."${tellesflorian.apache.webappName}" = tellesflorian.app.webRoot; services.websites.integration.modules = adminer.apache.modules ++ tellesflorian.apache.modules; services.websites.integration.vhostConfs.tellesflorian = { certName = "eldiron"; -- cgit v1.2.3