X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fpiedsjaloux%2Fintegration.nix;h=d8790cc93a6a4d828723f467af0863c7cf536775;hb=d3452fc59b9839846225fd254926c64a9c71f071;hp=76523edd81edbc662e4ac19a86159d981ece5778;hpb=5400b9b6f65451d41a9106fae6fc00f97d83f4ef;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/piedsjaloux/integration.nix b/modules/private/websites/piedsjaloux/integration.nix
index 76523ed..d8790cc 100644
--- a/modules/private/websites/piedsjaloux/integration.nix
+++ b/modules/private/websites/piedsjaloux/integration.nix
@@ -1,15 +1,20 @@
{ lib, pkgs, config, ... }:
let
secrets = config.myEnv.websites.piedsjaloux.integration;
- app = pkgs.webapps.piedsjaloux.override { environment = secrets.environment; };
+ app = pkgs.callPackage ./app {
+ environment = secrets.environment;
+ varDir = "/var/lib/piedsjaloux_integration";
+ secretsPath = config.secrets.fullPaths."websites/piedsjaloux/integration";
+ };
cfg = config.myServices.websites.piedsjaloux.integration;
pcfg = config.services.phpApplication;
+ texlive = pkgs.texlive.combine { inherit (pkgs.texlive) attachfile preprint scheme-small; };
in {
options.myServices.websites.piedsjaloux.integration.enable = lib.mkEnableOption "enable PiedsJaloux's website in integration";
config = lib.mkIf cfg.enable {
- services.duplyBackup.profiles.piedsjaloux_dev.rootDir = app.varDir;
- services.phpApplication.apps.piedsjaloux_dev = {
+ services.duplyBackup.profiles.piedsjaloux_integration.rootDir = app.varDir;
+ services.phpApplication.apps.piedsjaloux_integration = {
websiteEnv = "integration";
httpdUser = config.services.httpd.Inte.user;
httpdGroup = config.services.httpd.Inte.group;
@@ -32,17 +37,22 @@ in {
"pm.process_idle_timeout" = "60";
};
phpEnv = {
- PATH = lib.makeBinPath [ pkgs.apg pkgs.unzip ];
- SYMFONY_DEBUG_MODE = "yes";
+ PATH = lib.makeBinPath [
+ pkgs.apg pkgs.unzip
+ # below ones don't need to be in the PATH but theyâre used in
+ # secrets
+ pkgs.imagemagick texlive
+ ];
+ SYMFONY_DEBUG_MODE = "\"yes\"";
};
phpWatchFiles = [
- config.secrets.fullPaths."webapps/${app.environment}-piedsjaloux"
+ app.secretsPath
];
};
secrets.keys = [
{
- dest = "webapps/${app.environment}-piedsjaloux";
+ dest = "websites/piedsjaloux/integration";
user = config.services.httpd.Inte.user;
group = config.services.httpd.Inte.group;
permissions = "0400";
@@ -60,22 +70,22 @@ in {
mailer_user: null
mailer_password: null
secret: ${secrets.secret}
- pdflatex: "${pkgs.texlive.combine { inherit (pkgs.texlive) attachfile preprint scheme-small; }}/bin/pdflatex"
+ pdflatex: "${texlive}/bin/pdflatex"
leapt_im:
binary_path: ${pkgs.imagemagick}/bin
'';
}
];
- services.websites.env.integration.vhostConfs.piedsjaloux_dev = {
+ services.websites.env.integration.vhostConfs.piedsjaloux_integration = {
certName = "integration";
addToCerts = true;
hosts = [ "piedsjaloux.immae.eu" ];
- root = pcfg.webappDirs.piedsjaloux_dev;
+ root = pcfg.webappDirs.piedsjaloux_integration;
extraConfig = [
''
- SetHandler "proxy:unix:${pcfg.phpListenPaths.piedsjaloux_dev}|fcgi://localhost"
+ SetHandler "proxy:unix:${pcfg.phpListenPaths.piedsjaloux_integration}|fcgi://localhost"
@@ -84,7 +94,7 @@ in {
ErrorDocument 401 ""
-
+
Options Indexes FollowSymLinks MultiViews Includes
AllowOverride None
Require all granted