X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fludivinecassal%2Fproduction.nix;h=7cf00f0d797a7a62c5edf3222ba15a7298d68e87;hb=33b5010fd03e27f02e97efdf9ddcb7c48ac3281c;hp=341fd6d97d22dbd905bc788e4b84da582fb2a0e9;hpb=6a8252b11bb02f3e67857d5a9d733b1affa6a625;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/ludivinecassal/production.nix b/modules/private/websites/ludivinecassal/production.nix
index 341fd6d..7cf00f0 100644
--- a/modules/private/websites/ludivinecassal/production.nix
+++ b/modules/private/websites/ludivinecassal/production.nix
@@ -1,6 +1,6 @@
-{ lib, pkgs, config, myconfig,  ... }:
+{ lib, pkgs, config,  ... }:
 let
-  secrets = myconfig.env.websites.ludivinecassal.production;
+  secrets = config.myEnv.websites.ludivinecassal.production;
   app = pkgs.webapps.ludivinecassal.override { environment = secrets.environment; };
   pcfg = config.services.phpApplication;
   cfg = config.myServices.websites.ludivinecassal.production;
@@ -8,7 +8,7 @@ in {
   options.myServices.websites.ludivinecassal.production.enable = lib.mkEnableOption "enable Ludivine's website in production";
 
   config = lib.mkIf cfg.enable {
-    services.backup.profiles.ludivinecassal_prod.rootDir = app.varDir;
+    services.duplyBackup.profiles.ludivinecassal_prod.rootDir = app.varDir;
     services.webstats.sites = [ { name = "ludivinecassal.com"; } ];
     services.phpApplication.apps.ludivinecassal_prod = {
       websiteEnv = "production";
@@ -50,7 +50,7 @@ in {
           parameters:
               database_host: ${secrets.mysql.host}
               database_port: ${secrets.mysql.port}
-              database_name: ${secrets.mysql.name}
+              database_name: ${secrets.mysql.database}
               database_user: ${secrets.mysql.user}
               database_password: ${secrets.mysql.password}
               database_server_version: ${pkgs.mariadb.mysqlVersion}
@@ -68,7 +68,7 @@ in {
               ldap_base_dn: 'dc=immae,dc=eu'
               ldap_search_dn: '${secrets.ldap.dn}'
               ldap_search_password: '${secrets.ldap.password}'
-              ldap_search_filter: '${secrets.ldap.search}'
+              ldap_search_filter: '${secrets.ldap.filter}'
           leapt_im:
               binary_path: ${pkgs.imagemagick}/bin
           assetic:
@@ -85,6 +85,10 @@ in {
       root         = pcfg.webappDirs.ludivinecassal_prod;
       extraConfig  = [
         ''
+        RewriteEngine on
+        RewriteCond "%{HTTP_HOST}" "!^ludivinecassal\.com$" [NC]
+        RewriteRule ^(.+)$ https://ludivinecassal.com$1 [R=302,L]
+
         <FilesMatch "\.php$">
           SetHandler "proxy:unix:${pcfg.phpListenPaths.ludivinecassal_prod}|fcgi://localhost"
         </FilesMatch>