Remove useless relative symlinks

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

index f3945748764e98c1eef1036053913b38609da780..8fbca2d8d6d703a8a1ad05be3966bf02b62a7dd4 100644 (file)
--- a/nixops/modules/websites/connexionswing/connexionswing.nix
+++ b/nixops/modules/websites/connexionswing/connexionswing.nix
@@ -7,19 +7,25 @@ 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_transport: sendmail
+            mailer_host: null
              mailer_user: null
              mailer_password: null
              subscription_email: ${config.email}
              allow_robots: true
              secret: ${config.secret}
+        ${if environment == "prod" then ''
+        services:
+          swiftmailer.mailer.default.transport:
+              class:     Swift_SendmailTransport
+              arguments: ['/run/wrappers/bin/sendmail -bs']
+        '' else ""}
        '';
      phpFpm = rec {
        socket = "/var/run/phpfpm/connexionswing-${environment}.sock";
@@ -35,7 +41,7 @@ let
          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"
+        php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:${configRoot}:${webappDir}:${varDir}:/tmp"
          php_admin_value[session.save_path] = "${varDir}/phpSessions"
          ${if environment == "dev" then ''
          pm = ondemand
@@ -50,10 +56,12 @@ let
          pm.max_spare_servers = 3
          ''}'';
      };
-    apache = {
+    apache = rec {
        user = "wwwrun";
        group = "wwwrun";
        modules = [ "proxy_fcgi" ];
+      webappName = "connexionswing_${environment}";
+      root = "/run/current-system/webapps/${webappName}";
        vhostConf = ''
        <FilesMatch "\.php$">
          SetHandler "proxy:unix:${phpFpm.socket}|fcgi://localhost"
@@ -78,7 +86,7 @@ let
          ErrorDocument 401 "<html><meta http-equiv=\"refresh\" content=\"0;url=https://connexionswing.com\"></html>"
        </Location>
  
-      <Directory ${webRoot}>
+      <Directory ${root}>
          Options Indexes FollowSymLinks MultiViews Includes
          AllowOverride None
          Require all granted
@@ -121,7 +129,7 @@ let
        '' else ''
        Use Stats connexionswing.com
  
-      <Directory ${webRoot}>
+      <Directory ${root}>
          Options Indexes FollowSymLinks MultiViews Includes
          AllowOverride All
          Require all granted
@@ -160,8 +168,8 @@ let
            rm app/config/parameters.yml
            ln -sf ${configRoot} app/config/parameters.yml
            rm -rf var/{logs,cache}
-          ln -sf ../../../../../../${varDir}/var/{logs,cache} var/
-          ln -sf ../../../../../${varDir}/{medias,uploads} web/images/
+          ln -sf ${varDir}/var/{logs,cache} var/
+          ln -sf ${varDir}/{medias,uploads} web/images/
            '';
        });
      webRoot = "${webappDir}/web";