X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fapp.nix;h=27810a59e8de9726e39d8c6dada1e9106186c7fb;hb=41cce84a02652e22ad967c9f31669092eb3e7f0e;hp=14358d87972a9a95093a52e21a117e54e8de7a9d;hpb=dcac3ec730176549cd52a9a42db2001dc652c30d;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix index 14358d8..27810a5 100644 --- a/modules/private/websites/florian/app.nix +++ b/modules/private/websites/florian/app.nix @@ -2,12 +2,7 @@ let adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; }; secrets = config.myEnv.websites.tellesflorian.integration; - app = pkgs.callPackage ./app { - composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; - environment = secrets.environment; - varDir = "/var/lib/florian_app"; - secretsPath = config.secrets.fullPaths."websites/florian/app"; - }; + webRoot = "/var/lib/ftp/immae/florian/web"; cfg = config.myServices.websites.florian.app; pcfg = config.services.phpApplication; in { @@ -19,14 +14,15 @@ in { websiteEnv = "integration"; httpdUser = config.services.httpd.Inte.user; httpdGroup = config.services.httpd.Inte.group; - inherit (app) webRoot varDir; + inherit webRoot; + varDir = "/var/lib/ftp/immae/florian_var"; varDirPaths = { "var" = "0700"; }; - inherit app; + app = "/var/lib/ftp/immae/florian"; serviceDeps = [ "mysql.service" ]; preStartActions = [ - "./bin/console --env=${app.environment} cache:clear --no-warmup" + "./bin/console --env=dev cache:clear --no-warmup" ]; phpOpenbasedir = [ "/tmp" ]; phpPool = { @@ -46,18 +42,16 @@ in { phpPackage = pkgs.php72; }; - secrets.keys = [ - { - dest = "websites/florian/app_passwords"; + secrets.keys = { + "websites/florian/app_passwords" = { user = config.services.httpd.Inte.user; group = config.services.httpd.Inte.group; permissions = "0400"; text = '' invite:${secrets.invite_passwords} ''; - } - { - dest = "websites/florian/app"; + }; + "websites/florian/app" = { user = config.services.httpd.Inte.user; group = config.services.httpd.Inte.group; permissions = "0400"; @@ -75,15 +69,15 @@ in { mailer_password: null secret: ${secrets.secret} ''; - } - ]; + }; + }; services.websites.env.integration.modules = adminer.apache.modules; services.websites.env.integration.vhostConfs.florian_app = { certName = "integration"; addToCerts = true; hosts = [ "app.tellesflorian.com" ]; - root = pcfg.webappDirs.florian_app; + root = webRoot; extraConfig = [ '' @@ -101,7 +95,7 @@ in { ErrorDocument 401 "" - + Options Indexes FollowSymLinks MultiViews Includes AllowOverride None Require all granted