From: Ismaël Bouya Date: Sat, 11 May 2019 14:26:38 +0000 (+0200) Subject: Add Tellesflorian website to pkgs X-Git-Tag: nur_publish~28 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=c890321db12036be69ebbece202984874b1e5a57;p=perso%2FImmae%2FConfig%2FNix.git Add Tellesflorian website to pkgs --- diff --git a/nixops/modules/websites/tellesflorian/default.nix b/nixops/modules/websites/tellesflorian/default.nix index f86b0c5..381476c 100644 --- a/nixops/modules/websites/tellesflorian/default.nix +++ b/nixops/modules/websites/tellesflorian/default.nix @@ -1,13 +1,13 @@ { lib, pkgs, config, myconfig, mylibs, ... }: let - adminer = pkgs.callPackage ../commons/adminer.nix {}; + adminer = pkgs.callPackage ../commons/adminer.nix {}; - tellesflorian = pkgs.callPackage ./tellesflorian.nix { inherit (mylibs) fetchedGitPrivate; }; - tellesflorian_dev = tellesflorian { - config = myconfig.env.websites.tellesflorian.integration; - }; + tellesflorian_dev = pkgs.callPackage ./tellesflorian.nix { + inherit (pkgs.private.webapps) tellesflorian; + config = myconfig.env.websites.tellesflorian.integration; + }; - cfg = config.services.myWebsites.TellesFlorian; + cfg = config.services.myWebsites.TellesFlorian; in { options.services.myWebsites.TellesFlorian = { integration = { @@ -24,7 +24,7 @@ in { system.activationScripts.tellesflorian_dev = tellesflorian_dev.activationScript; system.extraSystemBuilderCmds = '' mkdir -p $out/webapps - ln -s ${tellesflorian_dev.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName} + ln -s ${tellesflorian_dev.app.webRoot} $out/webapps/${tellesflorian_dev.apache.webappName} ''; services.myWebsites.integration.modules = adminer.apache.modules ++ tellesflorian_dev.apache.modules; services.myWebsites.integration.vhostConfs.tellesflorian = { diff --git a/nixops/modules/websites/tellesflorian/tellesflorian.nix b/nixops/modules/websites/tellesflorian/tellesflorian.nix index afd723c..5955431 100644 --- a/nixops/modules/websites/tellesflorian/tellesflorian.nix +++ b/nixops/modules/websites/tellesflorian/tellesflorian.nix @@ -1,175 +1,154 @@ -{ lib, writeText, fetchedGitPrivate, fetchurl, stdenv, composerEnv }: -let - tellesflorian = { config }: rec { - environment = config.environment; - varDir = "/var/lib/tellesflorian_${environment}"; - keys = [ - { - dest = "webapps/${environment}-tellesflorian-passwords"; - user = apache.user; - group = apache.group; - permissions = "0400"; - text = '' - invite:${config.invite_passwords} - ''; - } - { - dest = "webapps/${environment}-tellesflorian"; - user = apache.user; - group = apache.group; - permissions = "0400"; - text = '' - # This file is auto-generated during the composer install - parameters: - database_host: ${config.mysql.host} - database_port: ${config.mysql.port} - database_name: ${config.mysql.name} - database_user: ${config.mysql.user} - database_password: ${config.mysql.password} - mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: null - mailer_password: null - secret: ${config.secret} - ''; - } - ]; - phpFpm = rec { - preStart = '' - if [ ! -f "${varDir}/currentWebappDir" -o \ - ! -f "${varDir}/currentKey" -o \ - "${webappDir}" != "$(cat ${varDir}/currentWebappDir 2>/dev/null)" ] \ - || ! sha512sum -c --status ${varDir}/currentKey; then - pushd ${webappDir} > /dev/null - /run/wrappers/bin/sudo -u wwwrun ./bin/console --env=${environment} cache:clear --no-warmup - popd > /dev/null - echo -n "${webappDir}" > ${varDir}/currentWebappDir - sha512sum /var/secrets/webapps/${environment}-tellesflorian > ${varDir}/currentKey - fi - ''; - serviceDeps = [ "mysql.service" ]; - socket = "/var/run/phpfpm/floriantelles-${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] = "/var/secrets/webapps/${environment}-tellesflorian:${webappDir}:${varDir}:/tmp" - php_admin_value[session.save_path] = "${varDir}/phpSessions" - ${if environment == "dev" then '' - pm = ondemand - pm.max_children = 5 - pm.process_idle_timeout = 60 - env[SYMFONY_DEBUG_MODE] = "yes" - '' else '' - pm = dynamic - pm.max_children = 20 - pm.start_servers = 2 - pm.min_spare_servers = 1 - pm.max_spare_servers = 3 - ''}''; - }; - apache = rec { - user = "wwwrun"; - group = "wwwrun"; - modules = [ "proxy_fcgi" ]; - webappName = "florian_${environment}"; - root = "/run/current-system/webapps/${webappName}"; - vhostConf = '' - - SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" - +{ tellesflorian, config }: +rec { + app = tellesflorian.override { inherit (config) environment; }; + keys = [ + { + dest = "webapps/${app.environment}-tellesflorian-passwords"; + user = apache.user; + group = apache.group; + permissions = "0400"; + text = '' + invite:${config.invite_passwords} + ''; + } + { + dest = "webapps/${app.environment}-tellesflorian"; + user = apache.user; + group = apache.group; + permissions = "0400"; + text = '' + # This file is auto-generated during the composer install + parameters: + database_host: ${config.mysql.host} + database_port: ${config.mysql.port} + database_name: ${config.mysql.name} + database_user: ${config.mysql.user} + database_password: ${config.mysql.password} + mailer_transport: smtp + mailer_host: 127.0.0.1 + mailer_user: null + mailer_password: null + secret: ${config.secret} + ''; + } + ]; + phpFpm = rec { + preStart = '' + if [ ! -f "${app.varDir}/currentWebappDir" -o \ + ! -f "${app.varDir}/currentKey" -o \ + "${app}" != "$(cat ${app.varDir}/currentWebappDir 2>/dev/null)" ] \ + || ! sha512sum -c --status ${app.varDir}/currentKey; then + pushd ${app} > /dev/null + /run/wrappers/bin/sudo -u wwwrun ./bin/console --env=${app.environment} cache:clear --no-warmup + popd > /dev/null + echo -n "${app}" > ${app.varDir}/currentWebappDir + sha512sum /var/secrets/webapps/${app.environment}-tellesflorian > ${app.varDir}/currentKey + fi + ''; + serviceDeps = [ "mysql.service" ]; + socket = "/var/run/phpfpm/floriantelles-${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] = "/var/secrets/webapps/${app.environment}-tellesflorian:${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 + env[SYMFONY_DEBUG_MODE] = "yes" + '' else '' + pm = dynamic + pm.max_children = 20 + pm.start_servers = 2 + pm.min_spare_servers = 1 + pm.max_spare_servers = 3 + ''}''; + }; + apache = rec { + user = "wwwrun"; + group = "wwwrun"; + modules = [ "proxy_fcgi" ]; + webappName = "florian_${app.environment}"; + root = "/run/current-system/webapps/${webappName}"; + vhostConf = '' + + SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost" + - ${if environment == "dev" then '' - - AuthBasicProvider file ldap - Use LDAPConnect - Require ldap-group cn=app.tellesflorian.com,cn=httpd,ou=services,dc=immae,dc=eu + ${if app.environment == "dev" then '' + + AuthBasicProvider file ldap + Use LDAPConnect + Require ldap-group cn=app.tellesflorian.com,cn=httpd,ou=services,dc=immae,dc=eu - AuthUserFile "/var/secrets/webapps/${environment}-tellesflorian-passwords" - Require user "invite" + AuthUserFile "/var/secrets/webapps/${app.environment}-tellesflorian-passwords" + Require user "invite" - ErrorDocument 401 "" - + ErrorDocument 401 "" + - - Options Indexes FollowSymLinks MultiViews Includes - AllowOverride None - Require all granted + + Options Indexes FollowSymLinks MultiViews Includes + AllowOverride None + Require all granted - DirectoryIndex app_dev.php + DirectoryIndex app_dev.php - - Options -MultiViews - + + Options -MultiViews + - - RewriteEngine On + + RewriteEngine On - RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$ - RewriteRule ^(.*) - [E=BASE:%1] + RewriteCond %{REQUEST_URI}::$1 ^(/.+)/(.*)::\2$ + RewriteRule ^(.*) - [E=BASE:%1] - # Maintenance script - RewriteCond %{DOCUMENT_ROOT}/maintenance.php -f - RewriteCond %{SCRIPT_FILENAME} !maintenance.php - RewriteRule ^.*$ %{ENV:BASE}/maintenance.php [R=503,L] - ErrorDocument 503 /maintenance.php + # Maintenance script + RewriteCond %{DOCUMENT_ROOT}/maintenance.php -f + RewriteCond %{SCRIPT_FILENAME} !maintenance.php + RewriteRule ^.*$ %{ENV:BASE}/maintenance.php [R=503,L] + ErrorDocument 503 /maintenance.php - # Sets the HTTP_AUTHORIZATION header removed by Apache - RewriteCond %{HTTP:Authorization} . - RewriteRule ^ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] + # Sets the HTTP_AUTHORIZATION header removed by Apache + RewriteCond %{HTTP:Authorization} . + RewriteRule ^ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}] - RewriteCond %{ENV:REDIRECT_STATUS} ^$ - RewriteRule ^app_dev\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L] + RewriteCond %{ENV:REDIRECT_STATUS} ^$ + RewriteRule ^app_dev\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L] - # If the requested filename exists, simply serve it. - # We only want to let Apache serve files and not directories. - RewriteCond %{REQUEST_FILENAME} -f - RewriteRule ^ - [L] + # If the requested filename exists, simply serve it. + # We only want to let Apache serve files and not directories. + RewriteCond %{REQUEST_FILENAME} -f + RewriteRule ^ - [L] - # Rewrite all other queries to the front controller. - RewriteRule ^ %{ENV:BASE}/app_dev.php [L] - + # Rewrite all other queries to the front controller. + RewriteRule ^ %{ENV:BASE}/app_dev.php [L] + - - '' else '' - - Options Indexes FollowSymLinks MultiViews Includes - AllowOverride All - Require all granted - - ''} - ''; - }; - activationScript = { - deps = [ "wrappers" ]; - text = '' - install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} \ - ${varDir}/var - install -m 0750 -o ${apache.user} -g ${apache.group} -d ${varDir}/phpSessions - ''; - }; - webappDir = composerEnv.buildPackage ( - import ./php-packages.nix { inherit composerEnv fetchurl; } // - fetchedGitPrivate ./tellesflorian.json // - rec { - noDev = (environment == "prod"); - preInstall = '' - export SYMFONY_ENV="${environment}" - ''; - postInstall = '' - cd $out - rm app/config/parameters.yml - ln -sf /var/secrets/webapps/${environment}-tellesflorian app/config/parameters.yml - rm -rf var/{logs,cache} - ln -sf ${varDir}/var/{logs,cache,sessions} var/ - ''; - }); - webRoot = "${webappDir}/web"; + + '' else '' + + Options Indexes FollowSymLinks MultiViews Includes + AllowOverride All + Require all granted + + ''} + ''; + }; + activationScript = { + deps = [ "wrappers" ]; + text = '' + install -m 0755 -o ${apache.user} -g ${apache.group} -d ${app.varDir} \ + ${app.varDir}/var + install -m 0750 -o ${apache.user} -g ${apache.group} -d ${app.varDir}/phpSessions + ''; }; -in - tellesflorian +} diff --git a/pkgs/private/webapps/default.nix b/pkgs/private/webapps/default.nix index 9acff98..46ad31c 100644 --- a/pkgs/private/webapps/default.nix +++ b/pkgs/private/webapps/default.nix @@ -4,4 +4,5 @@ rec { connexionswing = callPackage ./connexionswing { inherit composerEnv mylibs;}; ludivinecassal = callPackage ./ludivinecassal { inherit composerEnv mylibs; }; piedsjaloux = callPackage ./piedsjaloux { inherit composerEnv mylibs; }; + tellesflorian = callPackage ./tellesflorian { inherit composerEnv mylibs; }; } diff --git a/pkgs/private/webapps/tellesflorian/default.nix b/pkgs/private/webapps/tellesflorian/default.nix new file mode 100644 index 0000000..b1ccb98 --- /dev/null +++ b/pkgs/private/webapps/tellesflorian/default.nix @@ -0,0 +1,25 @@ +{ environment ? "prod" +, varDir ? "/var/lib/tellesflorian_${environment}" +, composerEnv, fetchurl, mylibs }: +let + app = composerEnv.buildPackage ( + import ./php-packages.nix { inherit composerEnv fetchurl; } // + mylibs.fetchedGitPrivate ./tellesflorian.json // + rec { + noDev = (environment == "prod"); + preInstall = '' + export SYMFONY_ENV="${environment}" + ''; + postInstall = '' + cd $out + rm app/config/parameters.yml + ln -sf /var/secrets/webapps/${environment}-tellesflorian app/config/parameters.yml + rm -rf var/{logs,cache} + ln -sf ${varDir}/var/{logs,cache,sessions} var/ + ''; + passthru = { + inherit varDir environment; + webRoot = "${app}/web"; + }; + }); +in app diff --git a/nixops/modules/websites/tellesflorian/php-packages.nix b/pkgs/private/webapps/tellesflorian/php-packages.nix similarity index 100% rename from nixops/modules/websites/tellesflorian/php-packages.nix rename to pkgs/private/webapps/tellesflorian/php-packages.nix diff --git a/nixops/modules/websites/tellesflorian/tellesflorian.json b/pkgs/private/webapps/tellesflorian/tellesflorian.json similarity index 100% rename from nixops/modules/websites/tellesflorian/tellesflorian.json rename to pkgs/private/webapps/tellesflorian/tellesflorian.json