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/isabelle/iridologie.nix | 113 ----------------------- 1 file changed, 113 deletions(-) delete mode 100644 modules/private/websites/isabelle/iridologie.nix (limited to 'modules/private/websites/isabelle/iridologie.nix') diff --git a/modules/private/websites/isabelle/iridologie.nix b/modules/private/websites/isabelle/iridologie.nix deleted file mode 100644 index cd733c1..0000000 --- a/modules/private/websites/isabelle/iridologie.nix +++ /dev/null @@ -1,113 +0,0 @@ -{ lib, pkgs, config, ... }: -let - 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"; - }; - - apacheUser = config.services.httpd.Prod.user; - apacheGroup = config.services.httpd.Prod.group; - 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 { - secrets.keys."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-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 = { - "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"; - }; - phpPackage = pkgs.php72; - }; - 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.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 = app.webRoot; - 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 ${app.webRoot}/htaccess.txt - - AllowOverride AuthConfig FileInfo Limit - Require all granted - - - - Require all denied - - - - Require all denied - - - Use Stats iridologie.icommandeur.org - '' - ]; - }; - services.websites.env.production.watchPaths = [ - secretsPath - ]; - }; -} -- cgit v1.2.3