X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fpiedsjaloux%2Fproduction.nix;h=03b9ec5e3d34784bcd7cdc77bb0a2a9934503f78;hb=db343436f0e678ef3a97e6f8ac559ffa0507e422;hp=e4e29c710d29f2ce242088e8f99ffca17dfeea04;hpb=33b5010fd03e27f02e97efdf9ddcb7c48ac3281c;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/piedsjaloux/production.nix b/modules/private/websites/piedsjaloux/production.nix
index e4e29c7..03b9ec5 100644
--- a/modules/private/websites/piedsjaloux/production.nix
+++ b/modules/private/websites/piedsjaloux/production.nix
@@ -1,16 +1,22 @@
{ lib, pkgs, config, ... }:
let
secrets = config.myEnv.websites.piedsjaloux.production;
- app = pkgs.webapps.piedsjaloux.override { environment = secrets.environment; };
+ app = pkgs.callPackage ./app {
+ composerEnv = pkgs.composerEnv.override { php = pkgs.php72; };
+ environment = secrets.environment;
+ varDir = "/var/lib/piedsjaloux_production";
+ secretsPath = config.secrets.fullPaths."websites/piedsjaloux/production";
+ };
cfg = config.myServices.websites.piedsjaloux.production;
pcfg = config.services.phpApplication;
+ texlive = pkgs.texlive.combine { inherit (pkgs.texlive) attachfile preprint scheme-small; };
in {
options.myServices.websites.piedsjaloux.production.enable = lib.mkEnableOption "enable PiedsJaloux's website in production";
config = lib.mkIf cfg.enable {
- services.duplyBackup.profiles.piedsjaloux_prod.rootDir = app.varDir;
+ services.duplyBackup.profiles.piedsjaloux_production.rootDir = app.varDir;
services.webstats.sites = [ { name = "piedsjaloux.fr"; } ];
- services.phpApplication.apps.piedsjaloux_prod = {
+ services.phpApplication.apps.piedsjaloux_production = {
websiteEnv = "production";
httpdUser = config.services.httpd.Prod.user;
httpdGroup = config.services.httpd.Prod.group;
@@ -24,25 +30,33 @@ in {
"./bin/console --env=${app.environment} cache:clear --no-warmup"
];
phpOpenbasedir = [ "/tmp" ];
- phpPool = ''
- php_admin_value[upload_max_filesize] = 20M
- php_admin_value[post_max_size] = 20M
- ;php_admin_flag[log_errors] = on
- env[PATH] = ${lib.makeBinPath [ pkgs.apg pkgs.unzip ]}
- pm = dynamic
- pm.max_children = 20
- pm.start_servers = 2
- pm.min_spare_servers = 1
- pm.max_spare_servers = 3
- '';
+ phpPool = {
+ "php_admin_value[upload_max_filesize]" = "20M";
+ "php_admin_value[post_max_size]" = "20M";
+ #"php_admin_flag[log_errors]" = "on";
+ "pm" = "dynamic";
+ "pm.max_children" = "20";
+ "pm.start_servers" = "2";
+ "pm.min_spare_servers" = "1";
+ "pm.max_spare_servers" = "3";
+ };
+ phpEnv = {
+ 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
+ ];
+ };
phpWatchFiles = [
- config.secrets.fullPaths."webapps/${app.environment}-piedsjaloux"
+ app.secretsPath
];
+ phpPackage = pkgs.php72;
};
secrets.keys = [
{
- dest = "webapps/${app.environment}-piedsjaloux";
+ dest = "websites/piedsjaloux/production";
user = config.services.httpd.Prod.user;
group = config.services.httpd.Prod.group;
permissions = "0400";
@@ -60,18 +74,18 @@ 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.production.vhostConfs.piedsjaloux_prod = {
+ services.websites.env.production.vhostConfs.piedsjaloux_production = {
certName = "piedsjaloux";
certMainHost = "piedsjaloux.fr";
hosts = [ "piedsjaloux.fr" "www.piedsjaloux.fr" ];
- root = pcfg.webappDirs.piedsjaloux_prod;
+ root = pcfg.webappDirs.piedsjaloux_production;
extraConfig = [
''
RewriteEngine on
@@ -79,12 +93,12 @@ in {
RewriteRule ^(.+)$ https://www.piedsjaloux.fr$1 [R=302,L]
- SetHandler "proxy:unix:${pcfg.phpListenPaths.piedsjaloux_prod}|fcgi://localhost"
+ SetHandler "proxy:unix:${pcfg.phpListenPaths.piedsjaloux_production}|fcgi://localhost"
Use Stats piedsjaloux.fr
-
+
Options Indexes FollowSymLinks MultiViews Includes
AllowOverride All
Require all granted