From 1a64deeb894dc95e2645a75771732c6cc53a79ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 4 Oct 2023 01:35:06 +0200 Subject: Squash changes containing private information There were a lot of changes since the previous commit, but a lot of them contained personnal information about users. All thos changes got stashed into a single commit (history is kept in a different place) and private information was moved in a separate private repository --- modules/private/websites/chloe/integration.nix | 104 ------------------------- 1 file changed, 104 deletions(-) delete mode 100644 modules/private/websites/chloe/integration.nix (limited to 'modules/private/websites/chloe/integration.nix') diff --git a/modules/private/websites/chloe/integration.nix b/modules/private/websites/chloe/integration.nix deleted file mode 100644 index 533568e..0000000 --- a/modules/private/websites/chloe/integration.nix +++ /dev/null @@ -1,104 +0,0 @@ -{ lib, pkgs, config, ... }: -let - apacheUser = config.services.httpd.Inte.user; - apacheGroup = config.services.httpd.Inte.group; - ccfg = config.myEnv.websites.chloe.integration; - webRoot = "/var/lib/ftp/immae/chloe"; - varDir = "/var/lib/ftp/immae/chloe_var"; - cfg = config.myServices.websites.chloe.integration; -in { - options.myServices.websites.chloe.integration.enable = lib.mkEnableOption "enable Chloe's website in integration"; - - config = lib.mkIf cfg.enable { - secrets.keys."websites/chloe/integration" = { - user = apacheUser; - group = apacheGroup; - permissions = "0400"; - text = '' - SetEnv SPIP_CONFIG_DIR "${./config}" - SetEnv SPIP_VAR_DIR "${varDir}" - SetEnv SPIP_SITE "chloe-dev" - SetEnv SPIP_LDAP_BASE "dc=immae,dc=eu" - SetEnv SPIP_LDAP_HOST "ldaps://ldap.immae.eu" - SetEnv SPIP_LDAP_SEARCH_DN "${ccfg.ldap.dn}" - SetEnv SPIP_LDAP_SEARCH_PW "${ccfg.ldap.password}" - SetEnv SPIP_LDAP_SEARCH "${ccfg.ldap.filter}" - SetEnv SPIP_MYSQL_HOST "${ccfg.mysql.host}" - SetEnv SPIP_MYSQL_PORT "${ccfg.mysql.port}" - SetEnv SPIP_MYSQL_DB "${ccfg.mysql.database}" - SetEnv SPIP_MYSQL_USER "${ccfg.mysql.user}" - SetEnv SPIP_MYSQL_PASSWORD "${ccfg.mysql.password}" - ''; - }; - systemd.services.phpfpm-chloe_integration.after = lib.mkAfter [ "mysql.service" ]; - systemd.services.phpfpm-chloe_integration.wants = [ "mysql.service" ]; - services.phpfpm.pools.chloe_integration = { - user = config.services.httpd.Inte.user; - group = config.services.httpd.Inte.group; - 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]" = "${../../../../pkgs/webapps/spip/spip_mes_options.php}:${./config}:${webRoot}:${varDir}:/tmp"; - "php_admin_value[session.save_path]" = "${varDir}/phpSessions"; - "pm" = "ondemand"; - "pm.max_children" = "5"; - "pm.process_idle_timeout" = "60"; - }; - phpPackage = pkgs.php72; - }; - system.activationScripts.chloe_integration = { - deps = [ "wrappers" ]; - text = '' - install -m 0755 -o ${apacheUser} -g ${apacheGroup} -d ${varDir} ${varDir}/IMG ${varDir}/tmp ${varDir}/local - install -m 0750 -o ${apacheUser} -g ${apacheGroup} -d ${varDir}/phpSessions - ''; - }; - services.websites.env.integration.modules = [ "proxy_fcgi" ]; - services.websites.env.integration.vhostConfs.chloe_integration = { - certName = "integration"; - addToCerts = true; - hosts = ["test.chc.immae.dev" ]; - root = webRoot; - extraConfig = [ - '' - Include ${config.secrets.fullPaths."websites/chloe/integration"} - - RewriteEngine On - - - SetHandler "proxy:unix:${config.services.phpfpm.pools.chloe_integration.socket}|fcgi://localhost" - - - - DirectoryIndex index.php index.htm index.html - Options -Indexes +FollowSymLinks +MultiViews +Includes - Include ${webRoot}/htaccess.txt - - AllowOverride AuthConfig FileInfo Limit - Require all granted - - - - Require all denied - - - - Require all denied - - - - Use LDAPConnect - Require ldap-group cn=chc.immae.dev,cn=httpd,ou=services,dc=immae,dc=eu - ErrorDocument 401 "" - - '' - ]; - }; - services.websites.env.integration.watchPaths = [ - config.secrets.fullPaths."websites/chloe/integration" - ]; - }; -} -- cgit v1.2.3