X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Faten%2Fproduction.nix;h=21ecdcfcccc9c92247a152692b32ca08428ec8de;hb=717ccfd957e686d773480df817387aebbe79aa48;hp=7938241ead0c62a3b152fe0be8381ee6f9af9f52;hpb=f40f5b235b890f46770a22f005f8a0f664cf0562;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/aten/production.nix b/modules/private/websites/aten/production.nix
index 7938241..21ecdcf 100644
--- a/modules/private/websites/aten/production.nix
+++ b/modules/private/websites/aten/production.nix
@@ -1,37 +1,81 @@
{ lib, pkgs, config, myconfig, ... }:
let
- aten = pkgs.callPackage ./builder.nix {
- inherit (pkgs.webapps) aten;
- config = myconfig.env.websites.aten.production;
- apacheUser = config.services.httpd.Prod.user;
- apacheGroup = config.services.httpd.Prod.group;
- };
-
+ secrets = myconfig.env.websites.aten.production;
+ app = pkgs.webapps.aten.override { environment = secrets.environment; };
cfg = config.myServices.websites.aten.production;
+ pcfg = config.services.phpApplication;
in {
options.myServices.websites.aten.production.enable = lib.mkEnableOption "enable Aten's website in production";
config = lib.mkIf cfg.enable {
- secrets.keys = aten.keys;
services.webstats.sites = [ { name = "aten.pro"; } ];
-
- systemd.services.phpfpm-aten_prod.preStart = lib.mkAfter aten.phpFpm.preStart;
- systemd.services.phpfpm-aten_prod.after = lib.mkAfter aten.phpFpm.serviceDeps;
- systemd.services.phpfpm-aten_prod.wants = aten.phpFpm.serviceDeps;
- services.phpfpm.poolConfigs.aten_prod = aten.phpFpm.pool;
- system.activationScripts.aten_prod = aten.activationScript;
- system.extraSystemBuilderCmds = ''
- mkdir -p $out/webapps
- ln -s ${aten.app.webRoot} $out/webapps/${aten.apache.webappName}
+ services.phpApplication.apps.aten_prod = {
+ websiteEnv = "production";
+ httpdUser = config.services.httpd.Prod.user;
+ httpdGroup = config.services.httpd.Prod.group;
+ httpdWatchFiles = [
+ config.secrets.fullPaths."webapps/${app.environment}-aten"
+ ];
+ inherit (app) webRoot varDir;
+ inherit app;
+ serviceDeps = [ "postgresql.service" ];
+ preStartActions = [
+ "APP_ENV=${app.environment} ./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
+ pm = dynamic
+ pm.max_children = 20
+ pm.start_servers = 2
+ pm.min_spare_servers = 1
+ pm.max_spare_servers = 3
'';
- services.websites.production.modules = aten.apache.modules;
- services.websites.production.vhostConfs.aten = {
+ };
+
+ secrets.keys = [{
+ dest = "webapps/${app.environment}-aten";
+ user = config.services.httpd.Prod.user;
+ group = config.services.httpd.Prod.user;
+ permissions = "0400";
+ text = ''
+ SetEnv APP_ENV "${app.environment}"
+ SetEnv APP_SECRET "${secrets.secret}"
+ SetEnv DATABASE_URL "${secrets.psql_url}"
+ '';
+ }];
+ services.websites.env.production.vhostConfs.aten_prod = {
certName = "aten";
certMainHost = "aten.pro";
- hosts = [ "aten.pro" "www.aten.pro" ];
- root = aten.apache.root;
- extraConfig = [ aten.apache.vhostConf ];
+ hosts = [ "aten.pro" "www.aten.pro" ];
+ root = pcfg.webappDirs.aten_prod;
+ extraConfig = [
+ ''
+
+ SetHandler "proxy:unix:${pcfg.phpListenPaths.aten_prod}|fcgi://localhost"
+
+
+ Include ${config.secrets.fullPaths."webapps/${app.environment}-aten"}
+
+ Use Stats aten.pro
+
+
+ Use LDAPConnect
+ Require ldap-group cn=aten.pro,cn=httpd,ou=services,dc=immae,dc=eu
+ ErrorDocument 401 ""
+
+
+
+ Options Indexes FollowSymLinks MultiViews Includes
+ AllowOverride All
+ Require all granted
+ DirectoryIndex index.php
+ FallbackResource /index.php
+
+ ''
+ ];
};
};
}
-