Move production websites to use stable web directories

[perso/Immae/Config/Nix.git] / nixops / modules / websites / ludivine / ludivinecassal.nix
diff --git a/nixops/modules/websites/ludivine/ludivinecassal.nix b/nixops/modules/websites/ludivine/ludivinecassal.nix

index eff0bf8f762ed34104fb825e56239df578e6b5d6..3ffd335bace4875afd82c1d1c973f1d2b8b1c481 100644 (file)
--- a/nixops/modules/websites/ludivine/ludivinecassal.nix
+++ b/nixops/modules/websites/ludivine/ludivinecassal.nix
@@ -7,14 +7,14 @@ let
        writeText "parameters.yml" ''
          # This file is auto-generated during the composer install
          parameters:
-            database_host: db-1.immae.eu
-            database_port: null
+            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}
              database_server_version: ${pkgs.mariadb.mysqlVersion}
              mailer_transport: smtp
-            mailer_host: mail.immae.eu
+            mailer_host: 127.0.0.1
              mailer_user: null
              mailer_password: null
              secret: ${config.secret}
@@ -60,10 +60,12 @@ let
          pm.max_spare_servers = 3
          ''}'';
      };
-    apache = {
+    apache = rec {
        user = "wwwrun";
        group = "wwwrun";
        modules = [ "proxy_fcgi" ];
+      webappName = "ludivine_${environment}";
+      root = "/run/current-system/webapps/${webappName}";
        vhostConf = ''
        <FilesMatch "\.php$">
          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
@@ -76,7 +78,7 @@ let
          ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://ludivinecassal.com\"></html>"
        </Location>
  
-      <Directory ${webRoot}>
+      <Directory ${root}>
          Options Indexes FollowSymLinks MultiViews Includes
          AllowOverride None
          Require all granted
@@ -119,7 +121,7 @@ let
        '' else ''
        Use Stats ludivinecassal.com
  
-      <Directory ${webRoot}>
+      <Directory ${root}>
          Options Indexes FollowSymLinks MultiViews Includes
          AllowOverride All
          Require all granted