X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fapp.nix;h=14cda1bda1d8903c688b7132914d89849f26a61e;hb=bc0f9fcf0d366e10c0046390e516e11d5b76b2f8;hp=5ce073a1c23320a8091ab88a508ae76851547f53;hpb=1594c8da6fbb4ffa09ab970fb887cea61c572f60;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 5ce073a..14cda1b 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -1,63 +1,114 @@
-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
let
- adminer = pkgs.callPackage ../commons/adminer.nix {};
- secrets = myconfig.env.websites.tellesflorian.integration;
- app = pkgs.webapps.tellesflorian.override { environment = secrets.environment; };
+ adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
+ secrets = config.myEnv.websites.tellesflorian.integration;
cfg = config.myServices.websites.florian.app;
- pcfg = config.services.phpApplication;
+ ftpRoot = "/var/lib/florian_app";
+ phpRoot = "${ftpRoot}/php";
+ webRoot = "${phpRoot}/web";
+ varDir = "${ftpRoot}/var";
+ sessionDir = "${ftpRoot}/sessions";
+ packagePath = "/var/lib/ftp/release.immae.eu/buildbot/Florian";
+ branch = "stabilo_dev";
in {
options.myServices.websites.florian.app.enable = lib.mkEnableOption "enable Florian's app in integration";
config = lib.mkIf cfg.enable {
- services.phpApplication.apps.florian_dev = {
- websiteEnv = "integration";
- httpdUser = config.services.httpd.Inte.user;
- httpdGroup = config.services.httpd.Inte.group;
- inherit (app) webRoot varDir;
- varDirPaths = {
- "var" = "0700";
+ services.phpfpm.pools.florian_app = {
+ user = config.services.httpd.Inte.user;
+ group = config.services.httpd.Inte.group;
+ settings = {
+ "listen.owner" = config.services.httpd.Inte.user;
+ "listen.group" = config.services.httpd.Inte.group;
+ "php_admin_value[open_basedir]" = builtins.concatStringsSep ":" [
+ ftpRoot
+ config.secrets.fullPaths."websites/florian/app"
+ "/tmp"
+ ];
+ "php_admin_value[session.save_path]" = sessionDir;
+ "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";
};
- inherit app;
- serviceDeps = [ "mysql.service" ];
- preStartActions = [
- "./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"
+ phpEnv = {
+ SYMFONY_DEBUG_MODE = "\"yes\"";
+ };
+ phpPackage = pkgs.php72;
+ };
+ systemd.services."phpfpm-florian_app" = {
+ after = lib.mkAfter ["mysql.service"];
+ wants = ["mysql.service"];
+ path = lib.mkAfter [ pkgs.gnutar pkgs.gzip pkgs.php72 ];
+ preStart = let
+ script = pkgs.writeScriptBin "florian-app-pre" ''
+ #! ${pkgs.stdenv.shell}
+
+ [ -f ${packagePath}/${branch}.tar.gz ] || exit 1
+
+ cd ${ftpRoot}
+ if ! [ -f .tarball_sum ] || ! sha256sum -c .tarball_sum; then
+ tar -xf ${packagePath}/${branch}.tar.gz --one-top-level=php_new
+ if [ -d php ]; then
+ mv php php_old
+ fi
+ mv php_new php
+ fi
+ cd php
+ rm -rf var/{logs,cache}
+ ln -sf ${varDir}/{logs,cache,sessions} var/
+ ln -sf ${config.secrets.fullPaths."websites/florian/app"} app/config/parameters.yml
+ SYMFONY_ENV=dev ./bin/console --env=dev cache:clear --no-warmup
+ sha256sum ${packagePath}/${branch}.tar.gz > ${ftpRoot}/.tarball_sum
+ '';
+ in
+ "/run/wrappers/bin/sudo -u ${config.services.httpd.Inte.user} ${script}/bin/florian-app-pre";
+ postStart = let
+ script = pkgs.writeScriptBin "florian-app-post" ''
+ #! ${pkgs.stdenv.shell}
+
+ cd ${ftpRoot}
+ if [ -d php_old ]; then
+ rm -rf php_old
+ fi
+ '';
+ in
+ "/run/wrappers/bin/sudo -u ${config.services.httpd.Inte.user} ${script}/bin/florian-app-post";
+ serviceConfig.TimeoutStartSec="infinity";
+ };
+ services.filesWatcher.phpfpm-florian_app = {
+ restart = true;
+ paths = [ "${packagePath}/${branch}.tar.gz" ];
+ };
+
+ system.activationScripts.florian_app = {
+ deps = ["users"];
+ text = ''
+ install -m 0700 -o ${config.services.httpd.Inte.user} -g ${config.services.httpd.Inte.group} -d ${ftpRoot} ${sessionDir}
'';
- phpWatchFiles = [
- config.secrets.fullPaths."webapps/${app.environment}-tellesflorian"
- ];
};
- secrets.keys = [
- {
- dest = "webapps/${app.environment}-tellesflorian-passwords";
+ secrets.keys = {
+ "websites/florian/app_passwords" = {
user = config.services.httpd.Inte.user;
- group = config.services.httpd.Inte.user;
+ group = config.services.httpd.Inte.group;
permissions = "0400";
text = ''
invite:${secrets.invite_passwords}
'';
- }
- {
- dest = "webapps/${app.environment}-tellesflorian";
+ };
+ "websites/florian/app" = {
user = config.services.httpd.Inte.user;
- group = config.services.httpd.Inte.user;
+ group = config.services.httpd.Inte.group;
permissions = "0400";
text = ''
# This file is auto-generated during the composer install
parameters:
database_host: ${secrets.mysql.host}
database_port: ${secrets.mysql.port}
- database_name: ${secrets.mysql.name}
+ database_name: ${secrets.mysql.database}
database_user: ${secrets.mysql.user}
database_password: ${secrets.mysql.password}
mailer_transport: smtp
@@ -66,19 +117,19 @@ in {
mailer_password: null
secret: ${secrets.secret}
'';
- }
- ];
+ };
+ };
services.websites.env.integration.modules = adminer.apache.modules;
- services.websites.env.integration.vhostConfs.florian_dev = {
- certName = "eldiron";
+ services.websites.env.integration.vhostConfs.florian_app = {
+ certName = "integration";
addToCerts = true;
hosts = [ "app.tellesflorian.com" ];
- root = pcfg.webappDirs.florian_dev;
+ root = webRoot;
extraConfig = [
''
- SetHandler "proxy:unix:${pcfg.phpListenPaths.florian_dev}|fcgi://localhost"
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.florian_app.socket}|fcgi://localhost"
@@ -86,13 +137,13 @@ in {
Use LDAPConnect
Require ldap-group cn=app.tellesflorian.com,cn=httpd,ou=services,dc=immae,dc=eu
- AuthUserFile "${config.secrets.fullPaths."webapps/${app.environment}-tellesflorian-passwords"}"
+ AuthUserFile "${config.secrets.fullPaths."websites/florian/app_passwords"}"
Require user "invite"
ErrorDocument 401 ""
-
+
Options Indexes FollowSymLinks MultiViews Includes
AllowOverride None
Require all granted
@@ -133,7 +184,7 @@ in {
''
- adminer.apache.vhostConf
+ (adminer.apache.vhostConf null)
];
};
};