X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fwebsites%2Fdefault.nix;fp=modules%2Fwebsites%2Fdefault.nix;h=6658c6624f4470aee16c4d40cac77437a68b0f5a;hb=750fe5a43b957b91a26069cf8a4fe19fc7b2633c;hp=0a78c134ae56211dd4bf82c20f7dd91e7a6c0b4f;hpb=fcbdf67afe262bf6b35a4047956b2f8c12a04cb1;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/websites/default.nix b/modules/websites/default.nix index 0a78c13..6658c66 100644 --- a/modules/websites/default.nix +++ b/modules/websites/default.nix @@ -7,22 +7,6 @@ in certs = mkOption { description = "Default websites configuration for certificates as accepted by acme"; }; - webappDirs = mkOption { - description = '' - Defines a symlink between /run/current-system/webapps and a store - app directory to be used in http configuration. Permits to avoid - restarting httpd when only the folder name changes. - ''; - type = types.attrsOf types.path; - default = {}; - }; - webappDirsName = mkOption { - type = str; - default = "webapps"; - description = '' - Name of the webapp dir to create in /run/current-system - ''; - }; env = mkOption { default = {}; description = "Each type of website to enable will target a distinct httpd server"; @@ -145,17 +129,6 @@ in }; }); }; - # Readonly variables - webappDirsPaths = mkOption { - type = attrsOf path; - readOnly = true; - description = '' - Full paths of the webapp dir - ''; - default = attrsets.mapAttrs' (name: icfg: attrsets.nameValuePair - name "/run/current-system/${cfg.webappDirsName}/${name}" - ) cfg.webappDirs; - }; }; config.services.httpd = let @@ -268,14 +241,6 @@ in } ) groupedCerts; - config.system.extraSystemBuilderCmds = lib.mkIf (builtins.length (builtins.attrValues cfg.webappDirs) > 0) '' - mkdir -p $out/${cfg.webappDirsName} - ${builtins.concatStringsSep "\n" - (attrsets.mapAttrsToList - (name: path: "ln -s ${path} $out/${cfg.webappDirsName}/${name}") cfg.webappDirs) - } - ''; - config.systemd.services = let package = httpdName: config.services.httpd.${httpdName}.package.out; cfgFile = httpdName: config.services.httpd.${httpdName}.configFile;