X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fflorian%2Fapp.nix;h=1df61aca81f90ad551f197de95881c0309dc8b9c;hb=bbea22c02b6c059a6be1064391f06737ee244ba6;hp=19a88b0d377b0786f1054120c7ffaf72bff39655;hpb=d3452fc59b9839846225fd254926c64a9c71f071;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/florian/app.nix b/modules/private/websites/florian/app.nix
index 19a88b0..1df61ac 100644
--- a/modules/private/websites/florian/app.nix
+++ b/modules/private/websites/florian/app.nix
@@ -2,33 +2,30 @@
let
adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
secrets = config.myEnv.websites.tellesflorian.integration;
- app = pkgs.callPackage ./app {
- environment = secrets.environment;
- varDir = "/var/lib/florian_app";
- secretsPath = config.secrets.fullPaths."websites/florian/app";
- };
cfg = config.myServices.websites.florian.app;
- pcfg = config.services.phpApplication;
+ ftpRoot = "/var/lib/florian_app";
+ phpRoot = "${ftpRoot}/php";
+ webRoot = "${phpRoot}/web";
+ varDir = "${ftpRoot}/var";
+ 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.duplyBackup.profiles.florian_app.rootDir = app.varDir;
- services.phpApplication.apps.florian_app = {
- websiteEnv = "integration";
- httpdUser = config.services.httpd.Inte.user;
- httpdGroup = config.services.httpd.Inte.group;
- inherit (app) webRoot varDir;
- varDirPaths = {
- "var" = "0700";
- };
- inherit app;
- serviceDeps = [ "mysql.service" ];
- preStartActions = [
- "./bin/console --env=${app.environment} cache:clear --no-warmup"
- ];
- phpOpenbasedir = [ "/tmp" ];
- phpPool = {
+ 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_handler]" = "redis";
+ "php_admin_value[session.save_path]" = "'unix:///run/redis-php-sessions/redis.sock?persistent=1&prefix=Florian:App:'";
"php_admin_value[upload_max_filesize]" = "20M";
"php_admin_value[post_max_size]" = "20M";
#"php_admin_flag[log_errors]" = "on";
@@ -39,23 +36,70 @@ in {
phpEnv = {
SYMFONY_DEBUG_MODE = "\"yes\"";
};
- phpWatchFiles = [
- config.secrets.fullPaths."websites/florian/app"
- ];
+ phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [all.redis]);
+ };
+ 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}
+ '';
};
- secrets.keys = [
- {
- dest = "websites/florian/app_passwords";
+ secrets.keys = {
+ "websites/florian/app_passwords" = {
user = config.services.httpd.Inte.user;
group = config.services.httpd.Inte.group;
permissions = "0400";
text = ''
invite:${secrets.invite_passwords}
'';
- }
- {
- dest = "websites/florian/app";
+ };
+ "websites/florian/app" = {
user = config.services.httpd.Inte.user;
group = config.services.httpd.Inte.group;
permissions = "0400";
@@ -73,19 +117,19 @@ in {
mailer_password: null
secret: ${secrets.secret}
'';
- }
- ];
+ };
+ };
services.websites.env.integration.modules = adminer.apache.modules;
services.websites.env.integration.vhostConfs.florian_app = {
certName = "integration";
addToCerts = true;
hosts = [ "app.tellesflorian.com" ];
- root = pcfg.webappDirs.florian_app;
+ root = webRoot;
extraConfig = [
''
- SetHandler "proxy:unix:${pcfg.phpListenPaths.florian_app}|fcgi://localhost"
+ SetHandler "proxy:unix:${config.services.phpfpm.pools.florian_app.socket}|fcgi://localhost"
@@ -99,7 +143,7 @@ in {
ErrorDocument 401 ""
-
+
Options Indexes FollowSymLinks MultiViews Includes
AllowOverride None
Require all granted