X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fchloe%2Fchloe.nix;h=2847b9d9baffd1b38c8b21040414379daf466737;hb=7667c367033b15582cf383da62446f78e66a59ef;hp=9752db63b7f81c059100e2875a4ae3a2c97ca25a;hpb=7ebcaad53a3261d8a4aefd8a64c5c7d9d8ac2fa0;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/nixops/modules/websites/chloe/chloe.nix b/nixops/modules/websites/chloe/chloe.nix
index 9752db6..2847b9d 100644
--- a/nixops/modules/websites/chloe/chloe.nix
+++ b/nixops/modules/websites/chloe/chloe.nix
@@ -1,124 +1,105 @@
-{ stdenv, lib, fetchzip, fetchurl, fetchedGitPrivate, sassc }:
-let
- chloe = { config }: rec {
- environment = config.environment;
- phpFpm = rec {
- socket = "/var/run/phpfpm/chloe-${environment}.sock";
- pool = ''
- listen = ${socket}
- user = ${apache.user}
- group = ${apache.group}
- listen.owner = ${apache.user}
- listen.group = ${apache.group}
- 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] = "${../commons/spip/spip_mes_options.php}:${configDir}:${webRoot}:${varDir}:/tmp"
- php_admin_value[session.save_path] = "${varDir}/phpSessions"
- env[SPIP_CONFIG_DIR] = "${configDir}"
- env[SPIP_VAR_DIR] = "${varDir}"
- env[SPIP_SITE] = "chloe-${environment}"
- env[SPIP_LDAP_BASE] = "dc=immae,dc=eu"
- env[SPIP_LDAP_HOST] = "ldaps://ldap.immae.eu"
- env[SPIP_LDAP_SEARCH_DN] = "${config.ldap.dn}"
- env[SPIP_LDAP_SEARCH_PW] = "${config.ldap.password}"
- env[SPIP_LDAP_SEARCH] = "${config.ldap.search}"
- env[SPIP_MYSQL_HOST] = "${config.mysql.host}"
- env[SPIP_MYSQL_PORT] = "${config.mysql.port}"
- env[SPIP_MYSQL_DB] = "${config.mysql.name}"
- env[SPIP_MYSQL_USER] = "${config.mysql.user}"
- env[SPIP_MYSQL_PASSWORD] = "${config.mysql.password}"
- ${if environment == "dev" then ''
- pm = ondemand
- pm.max_children = 5
- pm.process_idle_timeout = 60
- '' else ''
- pm = dynamic
- pm.max_children = 20
- pm.start_servers = 2
- pm.min_spare_servers = 1
- pm.max_spare_servers = 3
- ''}'';
- };
- apache = {
- user = "wwwrun";
- group = "wwwrun";
- modules = [ "proxy_fcgi" ];
- vhostConf = ''
- RewriteEngine On
- ${if environment == "prod" then ''
- RewriteRule ^/news.rss /spip.php?page=backend&id_rubrique=1
- '' else ""}
+{ chloe, config }:
+rec {
+ app = chloe.override { inherit (config) environment; };
+ phpFpm = rec {
+ serviceDeps = [ "mysql.service" ];
+ socket = "/var/run/phpfpm/chloe-${app.environment}.sock";
+ pool = ''
+ listen = ${socket}
+ user = ${apache.user}
+ group = ${apache.group}
+ listen.owner = ${apache.user}
+ listen.group = ${apache.group}
+ 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}:${configDir}:${app}:${app.varDir}:/tmp"
+ php_admin_value[session.save_path] = "${app.varDir}/phpSessions"
+ ${if app.environment == "dev" then ''
+ pm = ondemand
+ pm.max_children = 5
+ pm.process_idle_timeout = 60
+ '' else ''
+ pm = dynamic
+ pm.max_children = 20
+ pm.start_servers = 2
+ pm.min_spare_servers = 1
+ pm.max_spare_servers = 3
+ ''}'';
+ };
+ keys = [{
+ dest = "webapps/${app.environment}-chloe";
+ user = apache.user;
+ group = apache.group;
+ permissions = "0400";
+ text = ''
+ SetEnv SPIP_CONFIG_DIR "${configDir}"
+ SetEnv SPIP_VAR_DIR "${app.varDir}"
+ SetEnv SPIP_SITE "chloe-${app.environment}"
+ SetEnv SPIP_LDAP_BASE "dc=immae,dc=eu"
+ SetEnv SPIP_LDAP_HOST "ldaps://ldap.immae.eu"
+ SetEnv SPIP_LDAP_SEARCH_DN "${config.ldap.dn}"
+ SetEnv SPIP_LDAP_SEARCH_PW "${config.ldap.password}"
+ SetEnv SPIP_LDAP_SEARCH "${config.ldap.search}"
+ SetEnv SPIP_MYSQL_HOST "${config.mysql.host}"
+ SetEnv SPIP_MYSQL_PORT "${config.mysql.port}"
+ SetEnv SPIP_MYSQL_DB "${config.mysql.name}"
+ SetEnv SPIP_MYSQL_USER "${config.mysql.user}"
+ SetEnv SPIP_MYSQL_PASSWORD "${config.mysql.password}"
+ '';
+ }];
+ apache = rec {
+ user = "wwwrun";
+ group = "wwwrun";
+ modules = [ "proxy_fcgi" ];
+ webappName = "chloe_${app.environment}";
+ root = "/run/current-system/webapps/${webappName}";
+ vhostConf = ''
+ Include /var/secrets/webapps/${app.environment}-chloe
-
- SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
-
+ RewriteEngine On
+ ${if app.environment == "prod" then ''
+ RewriteRule ^/news.rss /spip.php?page=backend&id_rubrique=1
+ '' else ""}
-
- DirectoryIndex index.php index.htm index.html
- Options -Indexes +FollowSymLinks +MultiViews +Includes
- Include ${webRoot}/htaccess.txt
+
+ SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+
- AllowOverride AuthConfig FileInfo Limit
- Require all granted
-
+
+ DirectoryIndex index.php index.htm index.html
+ Options -Indexes +FollowSymLinks +MultiViews +Includes
+ Include ${root}/htaccess.txt
-
- Require all denied
-
+ AllowOverride AuthConfig FileInfo Limit
+ Require all granted
+
-
- Require all denied
-
+
+ Require all denied
+
- ${if environment == "dev" then ''
-
- Use LDAPConnect
- Require ldap-group cn=chloe.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu
- ErrorDocument 401 ""
-
- '' else ''
- Use Stats osteopathe-cc.fr
- ''}
- '';
- };
- activationScript = {
- deps = [ "wrappers" ];
- text = ''
- install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} ${varDir}/IMG ${varDir}/tmp ${varDir}/local
- install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions
- '';
- };
- configDir = ./chloe_config_ + environment;
- varDir = "/var/lib/chloe_${environment}";
- siteDir = stdenv.mkDerivation (fetchedGitPrivate ./chloe.json // rec {
- buildPhase = ''
- make
- '';
- installPhase = ''
- cp -a . $out
- '';
- buildInputs = [ sassc ];
- });
- webRoot = stdenv.mkDerivation rec {
- name = "chloe-${environment}-spip-${version}";
- version = "3.2.3";
- src = fetchzip {
- url = "https://files.spip.net/spip/archives/SPIP-v${version}.zip";
- sha256 = "1r1mjvsnrp6mvkgjakvi3x4ms8m8k5mp93micbbg8r99fj7qlfkq";
- };
- paches = [ ../commons/spip/spip_ldap_patch.patch ];
- buildPhase = ''
- rm -rf IMG local tmp config/remove.txt
- ln -sf ${../commons/spip/spip_mes_options.php} config/mes_options.php
- echo "Require all denied" > "config/.htaccess"
- ln -sf ../../../../../${varDir}/{IMG,local} .
- '';
- installPhase = ''
- cp -a . $out
- cp -a ${siteDir}/* $out
+
+ Require all denied
+
+
+ ${if app.environment == "dev" then ''
+
+ Use LDAPConnect
+ Require ldap-group cn=chloe.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu
+ ErrorDocument 401 ""
+
+ '' else ''
+ Use Stats osteopathe-cc.fr
+ ''}
'';
- };
};
-in
- chloe
+ activationScript = {
+ deps = [ "wrappers" ];
+ text = ''
+ install -m 0755 -o ${apache.user} -g ${apache.group} -d ${app.varDir} ${app.varDir}/IMG ${app.varDir}/tmp ${app.varDir}/local
+ install -m 0750 -o ${apache.user} -g ${apache.group} -d ${app.varDir}/phpSessions
+ '';
+ };
+ configDir = ./chloe_config_ + app.environment;
+}