Add ludivinecassal host

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 71ff57d78fceca7a06efb7b36fac362186bdf3c8..d76977c1f918f711c3309961e437f0d64298b36f 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -89,6 +89,8 @@
     ];
 
     security.acme.certs = {
+      # /!\ To create a new certificate, add first the domain to an
+      # existing certificate, deploy, and then use it in httpd.
       "eldiron" = {
         webroot = "/var/lib/acme/acme-challenge";
         email = "ismael@bouya.org";
@@ -104,6 +106,20 @@
           "connexionswing.immae.eu" = null;
           "sandetludo.immae.eu" = null;
           "cloud.immae.eu" = null;
+          "ludivine.immae.eu" = null;
+          "ludivinecassal.com" = null;
+        };
+      };
+      "ludivinecassal" = {
+        webroot = "/var/lib/acme/acme-challenge";
+        email = "ismael@bouya.org";
+        domain = "ludivinecassal.com";
+        plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" ];
+        postRun = ''
+          systemctl reload httpd.service
+        '';
+        extraDomains = {
+          "www.ludivinecassal.com" = null;
         };
       };
       # "connexionswing" = {
@@ -172,6 +188,8 @@
         adminer = mypkgs.adminer.phpFpm.pool;
         connexionswing_dev = mypkgs.connexionswing_dev.phpFpm.pool;
         connexionswing_prod = mypkgs.connexionswing_prod.phpFpm.pool;
+        ludivinecassal_dev = mypkgs.ludivinecassal_dev.phpFpm.pool;
+        ludivinecassal_prod = mypkgs.ludivinecassal_prod.phpFpm.pool;
         nextcloud = mypkgs.nextcloud.phpFpm.pool;
         mantisbt = mypkgs.mantisbt.phpFpm.pool;
       };
@@ -180,6 +198,8 @@
     system.activationScripts = {
       connexionswing_dev  = mypkgs.connexionswing_dev.activationScript;
       connexionswing_prod = mypkgs.connexionswing_prod.activationScript;
+      ludivinecassal_dev  = mypkgs.ludivinecassal_dev.activationScript;
+      ludivinecassal_prod  = mypkgs.ludivinecassal_prod.activationScript;
       nextcloud = mypkgs.nextcloud.activationScript;
       httpd = ''
         install -d -m 0755 /var/lib/acme/acme-challenge
@@ -303,6 +323,8 @@
         mypkgs.nextcloud.apache.modules ++
         mypkgs.connexionswing_dev.apache.modules ++
         mypkgs.connexionswing_prod.apache.modules ++
+        mypkgs.ludivinecassal_dev.apache.modules ++
+        mypkgs.ludivinecassal_prod.apache.modules ++
         mypkgs.ympd.apache.modules ++
         mypkgs.git.web.apache.modules ++
         mypkgs.mantisbt.apache.modules ++
@@ -341,6 +363,21 @@
             mypkgs.connexionswing_dev.apache.vhostConf
           ];
         })
+        (withConf "eldiron" // {
+          hostName = "ludivine.immae.eu";
+          documentRoot = mypkgs.ludivinecassal_dev.webRoot;
+          extraConfig = builtins.concatStringsSep "\n" [
+            mypkgs.ludivinecassal_dev.apache.vhostConf
+          ];
+        })
+        (withConf "ludivinecassal" // {
+          hostName = "ludivinecassal.com";
+          serverAliases = [ "www.ludivinecassal.com" ];
+          documentRoot = mypkgs.ludivinecassal_prod.webRoot;
+          extraConfig = builtins.concatStringsSep "\n" [
+            mypkgs.ludivinecassal_prod.apache.vhostConf
+          ];
+        })
         (withConf "eldiron" // {
           hostName = "cloud.immae.eu";
           documentRoot = mypkgs.nextcloud.webRoot;

diff --git a/virtual/packages.nix b/virtual/packages.nix
index 03c8b891617f97e96331e4b1b45f6a28284bc9bc..557bc6b12cc1f5250fd54d5a266ab4e114955cb0 100644 (file)
--- a/virtual/packages.nix
+++ b/virtual/packages.nix
@@ -1,6 +1,7 @@
 { callPackage, checkEnv, fetchedGitPrivate, fetchedGithub }:
 let
   connexionswing = callPackage ./packages/connexionswing.nix { inherit checkEnv fetchedGitPrivate; };
+  ludivinecassal = callPackage ./packages/ludivinecassal.nix { inherit checkEnv fetchedGitPrivate; };
   nextcloud = callPackage ./packages/nextcloud.nix { inherit checkEnv; };
   adminer = callPackage ./packages/adminer.nix {};
   ympd = callPackage ./packages/ympd.nix {};
@@ -12,6 +13,8 @@ in
     inherit ympd;
     connexionswing_dev  = connexionswing { environment = "dev"; };
     connexionswing_prod = connexionswing { environment = "prod"; };
+    ludivinecassal_dev  = ludivinecassal { environment = "dev"; };
+    ludivinecassal_prod = ludivinecassal { environment = "prod"; };
     inherit nextcloud;
     inherit mantisbt;
     # FIXME: add buildbot

diff --git a/virtual/packages/connexionswing.nix b/virtual/packages/connexionswing.nix
index f178e495749251c0f11efac8ebec7d7b2a17f366..7f7dc16b397267be0339e31c56c37ec8914dbc87 100644 (file)
--- a/virtual/packages/connexionswing.nix
+++ b/virtual/packages/connexionswing.nix
@@ -119,7 +119,13 @@ let
         </IfModule>
 
       </Directory>
-      '' else ""}
+      '' else ''
+      <Directory ${webRoot}>
+        Options Indexes FollowSymLinks MultiViews Includes
+        AllowOverride All
+        Require all granted
+      </Directory>
+      ''}
       '';
     };
     activationScript = {

diff --git a/virtual/packages/ludivinecassal.nix b/virtual/packages/ludivinecassal.nix
new file mode 100644 (file)
index 0000000..636306a
--- /dev/null
+++ b/virtual/packages/ludivinecassal.nix
@@ -0,0 +1,177 @@
+{ lib, checkEnv, writeText, fetchedGitPrivate, stdenv, php, git, cacert, phpPackages, ruby, sass, imagemagick }:
+let
+  ludivinecassal = { environment ? "dev" }: rec {
+    varPrefix = "LUDIVINECASSAL";
+    varDir = "/var/lib/ludivinecassal_${environment}";
+    envName= lib.strings.toUpper environment;
+    configRoot =
+      assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_PASSWORD";
+      assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_USER";
+      assert checkEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_NAME";
+      assert checkEnv "NIXOPS_${varPrefix}_${envName}_SECRET";
+      assert checkEnv "NIXOPS_${varPrefix}_${envName}_LDAP_PASSWORD";
+      assert checkEnv "NIXOPS_${varPrefix}_${envName}_LDAP_SEARCH_DN";
+      assert checkEnv "NIXOPS_${varPrefix}_${envName}_LDAP_SEARCH_FILTER";
+      writeText "parameters.yml" ''
+        # This file is auto-generated during the composer install
+        parameters:
+            database_host: db-1.immae.eu
+            database_port: null
+            database_name: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_NAME"}
+            database_user: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_USER"}
+            database_password: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_MYSQL_PASSWORD"}
+            mailer_transport: smtp
+            mailer_host: mail.immae.eu
+            mailer_user: null
+            mailer_password: null
+            secret: ${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_SECRET"}
+            ldap_host: ldap.immae.eu
+            ldap_port: 636
+            ldap_version: 3
+            ldap_ssl: true
+            ldap_tls: false
+            ldap_user_bind: 'uid={username},ou=users,dc=immae,dc=eu'
+            ldap_base_dn: 'dc=immae,dc=eu'
+            ldap_search_dn: '${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_LDAP_SEARCH_DN"}'
+            ldap_search_password: '${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_LDAP_PASSWORD"}'
+            ldap_search_filter: '${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_LDAP_SEARCH_FILTER"}'
+        leapt_im:
+            binary_path: ${imagemagick}/bin
+        assetic:
+            sass: ${sass}/bin/sass
+            ruby: ${ruby}/bin/ruby
+      '';
+    phpFpm = rec {
+      socket = "/var/run/phpfpm/ludivinecassal-${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] = "${configRoot}:${webappDir}:${varDir}:/tmp"
+        ${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 = {
+      user = "wwwrun";
+      group = "wwwrun";
+      modules = [ "proxy_fcgi" ];
+      vhostConf = ''
+      <FilesMatch "\.php$">
+        SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
+      </FilesMatch>
+
+      ${if environment == "dev" then ''
+      <Location />
+        Use LDAPConnect
+        Require ldap-group   cn=ludivine.immae.eu,cn=httpd,ou=services,dc=immae,dc=eu
+        ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://ludivinecassal.com\"></html>"
+      </Location>
+
+      <Directory ${webRoot}>
+        Options Indexes FollowSymLinks MultiViews Includes
+        AllowOverride None
+        Require all granted
+
+        DirectoryIndex app_dev.php
+
+        <IfModule mod_negotiation.c>
+        Options -MultiViews
+        </IfModule>
+
+        <IfModule mod_rewrite.c>
+          RewriteEngine On
+
+          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
+
+          # 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]
+
+          # 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]
+        </IfModule>
+
+      </Directory>
+      '' else ''
+      <Directory ${webRoot}>
+        Options Indexes FollowSymLinks MultiViews Includes
+        AllowOverride All
+        Require all granted
+      </Directory>
+      ''}
+      '';
+    };
+    activationScript = {
+      deps = [ "wrappers" ];
+      text = ''
+      install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir}
+      if [ ! -f "${varDir}/currentWebappDir" -o \
+          "${webappDir}" != "$(cat ${varDir}/currentWebappDir 2>/dev/null)" ]; then
+        pushd ${webappDir} > /dev/null
+        $wrapperDir/sudo -u wwwrun ./bin/console --env=${environment} cache:clear --no-warmup
+        popd > /dev/null
+        echo -n "${webappDir}" > ${varDir}/currentWebappDir
+      fi
+      '';
+    };
+    webappDir = stdenv.mkDerivation (fetchedGitPrivate ./ludivinecassal_master.json // rec {
+      # FIXME: can we do better than symlink?
+      # FIXME: initial sync
+      # FIXME: backup
+      # FIXME: miniatures and data need to be in the same dir due to a
+      #        bug in leapt.im (searches for data/../miniatures)
+      buildPhase = ''
+        export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt
+        export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
+
+        ln -sf ${configRoot} app/config/parameters.yml
+        sed -i -e "/Incenteev..ParameterHandler..ScriptHandler::buildParameters/d" composer.json
+        ${if environment == "dev" then ''
+          composer install
+        '' else ''
+          SYMFONY_ENV=prod composer install --no-dev
+        ''}
+        rm -rf var
+        ln -sf ../../../../../${varDir} var
+        '';
+      installPhase = ''
+        cp -a . $out
+        '';
+      buildInputs = [
+        php git cacert phpPackages.composer sass
+      ];
+    });
+    webRoot = "${webappDir}/web";
+  };
+in
+  ludivinecassal

diff --git a/virtual/packages/ludivinecassal_master.json b/virtual/packages/ludivinecassal_master.json
new file mode 100644 (file)
index 0000000..403f9b0
--- /dev/null
+++ b/virtual/packages/ludivinecassal_master.json
@@ -0,0 +1,14 @@
+{
+  "tag": "4327b82-master",
+  "meta": {
+    "name": "ludivinecassal_master",
+    "url": "gitolite@git.immae.eu:perso/Immae/Sites/Ludivine",
+    "branch": "master"
+  },
+  "git": {
+    "url": "gitolite@git.immae.eu:perso/Immae/Sites/Ludivine",
+    "rev": "4327b82ec00cc514bfce5aa7155bcdbcc871c065",
+    "sha256": "1c5hnzvyvj45j61v2v5mh1l405ih74f58isr9dq21428kcfc2gyd",
+    "fetchSubmodules": true
+  }
+}