X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Faten%2Fintegration.nix;h=0c92818e71a77f25d837214b1f967a83635be6c0;hb=6a8252b11bb02f3e67857d5a9d733b1affa6a625;hp=790c5a93998596635b5ca3df465f7a92eb4e6ba4;hpb=f8026b6e4c869aa108f6361c8ccd50890657994d;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/aten/integration.nix b/modules/private/websites/aten/integration.nix
index 790c5a9..0c92818 100644
--- a/modules/private/websites/aten/integration.nix
+++ b/modules/private/websites/aten/integration.nix
@@ -1,34 +1,84 @@
{ lib, pkgs, config, myconfig, ... }:
let
- aten = pkgs.callPackage ./builder.nix {
- inherit (pkgs.webapps) aten;
- config = myconfig.env.websites.aten.integration;
- apacheUser = config.services.httpd.Inte.user;
- apacheGroup = config.services.httpd.Inte.group;
- };
-
+ secrets = myconfig.env.websites.aten.integration;
+ app = pkgs.webapps.aten.override { environment = secrets.environment; };
cfg = config.myServices.websites.aten.integration;
+ pcfg = config.services.phpApplication;
in {
options.myServices.websites.aten.integration.enable = lib.mkEnableOption "enable Aten's website in integration";
config = lib.mkIf cfg.enable {
- secrets.keys = aten.keys;
- services.myPhpfpm.preStart.aten_dev = aten.phpFpm.preStart;
- services.myPhpfpm.serviceDependencies.aten_dev = aten.phpFpm.serviceDeps;
- services.myPhpfpm.poolConfigs.aten_dev = aten.phpFpm.pool;
- system.activationScripts.aten_dev = aten.activationScript;
- system.extraSystemBuilderCmds = ''
- mkdir -p $out/webapps
- ln -s ${aten.app.webRoot} $out/webapps/${aten.apache.webappName}
+ services.backup.profiles.aten_dev.rootDir = app.varDir;
+ services.phpApplication.apps.aten_dev = {
+ websiteEnv = "integration";
+ httpdUser = config.services.httpd.Inte.user;
+ httpdGroup = config.services.httpd.Inte.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 = ondemand
+ pm.max_children = 5
+ pm.process_idle_timeout = 60
+ env[SYMFONY_DEBUG_MODE] = "yes"
'';
- services.websites.integration.modules = aten.apache.modules;
- services.websites.integration.vhostConfs.aten = {
+ };
+
+ secrets.keys = [{
+ dest = "webapps/${app.environment}-aten";
+ user = config.services.httpd.Inte.user;
+ group = config.services.httpd.Inte.group;
+ permissions = "0400";
+ text = ''
+ SetEnv APP_ENV "${app.environment}"
+ SetEnv APP_SECRET "${secrets.secret}"
+ SetEnv DATABASE_URL "${secrets.psql_url}"
+ '';
+ }];
+ services.websites.env.integration.vhostConfs.aten_dev = {
certName = "eldiron";
addToCerts = true;
hosts = [ "dev.aten.pro" ];
- root = aten.apache.root;
- extraConfig = [ aten.apache.vhostConf ];
+ root = pcfg.webappDirs.aten_dev;
+ extraConfig = [
+ ''
+
+ SetHandler "proxy:unix:${pcfg.phpListenPaths.aten_dev}|fcgi://localhost"
+
+
+ Include ${config.secrets.fullPaths."webapps/${app.environment}-aten"}
+
+
+ Use LDAPConnect
+ Require ldap-group cn=dev.aten.pro,cn=httpd,ou=services,dc=immae,dc=eu
+ ErrorDocument 401 ""
+
+
+
+ Use LDAPConnect
+ Require ldap-group cn=dev.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
+
+ ''
+ ];
};
};
}
-