X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fisabelle%2Firidologie.nix;h=560e60591b573798ad869ab5355f360b412ce1eb;hb=d3452fc59b9839846225fd254926c64a9c71f071;hp=ffbf2591f2bd107fe2c090a0d4d4222445bc6da1;hpb=514f9ec3beec470c4445be690673a0ceab9115b4;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix
index ffbf259..560e605 100644
--- a/modules/private/websites/isabelle/iridologie.nix
+++ b/modules/private/websites/isabelle/iridologie.nix
@@ -1,50 +1,121 @@
{ lib, pkgs, config, ... }:
let
- iridologie = pkgs.callPackage ./spip_builder.nix {
- inherit (pkgs.webapps) iridologie;
- config = config.myEnv.websites.isabelle.iridologie;
- apacheUser = config.services.httpd.Prod.user;
- apacheGroup = config.services.httpd.Prod.group;
+ icfg = config.myEnv.websites.isabelle.iridologie;
+ cfg = config.myServices.websites.isabelle.iridologie;
+ app = pkgs.callPackage ./iridologie_app {
+ inherit (icfg) environment;
+ inherit (pkgs.webapps) spip;
+ varDir = "/var/lib/isabelle_iridologie";
};
- cfg = config.myServices.websites.isabelle.iridologie;
+ apacheUser = config.services.httpd.Prod.user;
+ apacheGroup = config.services.httpd.Prod.group;
+ webappdir = config.services.websites.webappDirsPaths.isabelle_iridologie;
+ secretsPath = config.secrets.fullPaths."websites/isabelle/iridologie";
in {
options.myServices.websites.isabelle.iridologie.enable = lib.mkEnableOption "enable Iridologie's website";
config = lib.mkIf cfg.enable {
- services.duplyBackup.profiles.iridologie_prod.rootDir = iridologie.app.varDir;
- secrets.keys = iridologie.keys;
+ services.duplyBackup.profiles.isabelle_iridologie.rootDir = app.varDir;
+ secrets.keys = [
+ {
+ dest = "websites/isabelle/iridologie";
+ user = apacheUser;
+ group = apacheGroup;
+ permissions = "0400";
+ text = ''
+ SetEnv SPIP_CONFIG_DIR "${./config}"
+ SetEnv SPIP_VAR_DIR "${app.varDir}"
+ SetEnv SPIP_SITE "iridologie-${app.environment}"
+ SetEnv SPIP_LDAP_BASE "dc=immae,dc=eu"
+ SetEnv SPIP_LDAP_HOST "ldaps://ldap.immae.eu"
+ SetEnv SPIP_LDAP_SEARCH_DN "${icfg.ldap.dn}"
+ SetEnv SPIP_LDAP_SEARCH_PW "${icfg.ldap.password}"
+ SetEnv SPIP_LDAP_SEARCH "${icfg.ldap.filter}"
+ SetEnv SPIP_MYSQL_HOST "${icfg.mysql.host}"
+ SetEnv SPIP_MYSQL_PORT "${icfg.mysql.port}"
+ SetEnv SPIP_MYSQL_DB "${icfg.mysql.database}"
+ SetEnv SPIP_MYSQL_USER "${icfg.mysql.user}"
+ SetEnv SPIP_MYSQL_PASSWORD "${icfg.mysql.password}"
+ '';
+ }
+ ];
services.webstats.sites = [ { name = "iridologie.icommandeur.org"; } ];
- systemd.services.phpfpm-iridologie.after = lib.mkAfter iridologie.phpFpm.serviceDeps;
- systemd.services.phpfpm-iridologie.wants = iridologie.phpFpm.serviceDeps;
- services.phpfpm.pools.iridologie = {
+ systemd.services.phpfpm-isabelle_iridologie.after = lib.mkAfter [ "mysql.service" ];
+ systemd.services.phpfpm-isabelle_iridologie.wants = [ "mysql.service" ];
+ services.phpfpm.pools.isabelle_iridologie = {
user = config.services.httpd.Prod.user;
group = config.services.httpd.Prod.group;
- settings = iridologie.phpFpm.pool;
+ settings = {
+ "listen.owner" = "${apacheUser}";
+ "listen.group" = "${apacheGroup}";
+ "php_admin_value[upload_max_filesize]" = "20M";
+ "php_admin_value[post_max_size]" = "20M";
+ #"php_admin_flag[log_errors]" = "on";
+ "php_admin_value[open_basedir]" = "${app.spipConfig}:${./config}:${app}:${app.varDir}:/tmp";
+ "php_admin_value[session.save_path]" = "${app.varDir}/phpSessions";
+ "pm" = "dynamic";
+ "pm.max_children" = "20";
+ "pm.start_servers" = "2";
+ "pm.min_spare_servers" = "1";
+ "pm.max_spare_servers" = "3";
+ };
phpOptions = config.services.phpfpm.phpOptions + ''
extension=${pkgs.php}/lib/php/extensions/mysqli.so
'';
};
- system.activationScripts.iridologie = iridologie.activationScript;
- myServices.websites.webappDirs."${iridologie.apache.webappName}" = iridologie.app.webRoot;
- services.websites.env.production.modules = iridologie.apache.modules;
- services.websites.env.production.vhostConfs.iridologie = {
- certName = "aten";
+ system.activationScripts.isabelle_iridologie = {
+ deps = [ "wrappers" ];
+ text = ''
+ install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir} ${app.varDir}/IMG ${app.varDir}/tmp ${app.varDir}/local
+ install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${app.varDir}/phpSessions
+ '';
+ };
+ services.websites.webappDirs.isabelle_iridologie = app.webRoot;
+ services.websites.env.production.modules = [ "proxy_fcgi" ];
+ services.websites.env.production.vhostConfs.isabelle_iridologie = {
+ certName = "isabelle";
addToCerts = true;
hosts = [ "iridologie.icommandeur.org" "icommandeur.org" "www.icommandeur.org" ];
- root = iridologie.apache.root;
+ root = webappdir;
extraConfig = [
''
RewriteEngine On
RewriteCond "%{HTTP_HOST}" "!^iridologie\.icommandeur\.org$" [NC]
RewriteRule ^(.+)$ https://iridologie.icommandeur.org$1 [R=302,L]
+
+ Include ${secretsPath}
+
+ RewriteEngine On
+
+
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.isabelle_iridologie.socket}|fcgi://localhost"
+
+
+
+ DirectoryIndex index.php index.htm index.html
+ Options -Indexes +FollowSymLinks +MultiViews +Includes
+ Include ${webappdir}/htaccess.txt
+
+ AllowOverride AuthConfig FileInfo Limit
+ Require all granted
+
+
+
+ Require all denied
+
+
+
+ Require all denied
+
+
+ Use Stats iridologie.icommandeur.org
''
- (iridologie.apache.vhostConf config.services.phpfpm.pools.iridologie.socket)
];
};
services.websites.env.production.watchPaths = [
- "/var/secrets/webapps/${iridologie.app.environment}-iridologie"
+ secretsPath
];
};
}