Add bouya.org and outils.immae.eu domains

diff --git a/nixops/modules/websites/ftp/immae.nix b/nixops/modules/websites/ftp/immae.nix
index 6acfe44c15d2d8a483fe4aebdc5d2d06a84b2dd2..64e6a59a5ae29705d9e5318c9f852e1eef3a9a33 100644 (file)
--- a/nixops/modules/websites/ftp/immae.nix
+++ b/nixops/modules/websites/ftp/immae.nix
@@ -65,5 +65,16 @@ in {
         ''
       ];
     };
+
+    security.acme.certs."eldiron".extraDomains."bouya.org" = null;
+    security.acme.certs."eldiron".extraDomains."www.bouya.org" = null;
+    services.myWebsites.production.vhostConfs.bouya = {
+      certName    = "eldiron";
+      hosts       = [ "bouya.org" "www.bouya.org" ];
+      root        = null;
+      extraConfig = [ ''
+        RedirectMatch 301 ^/((?!\.well-known.*$).*)$ https://www.normalesup.org/~bouya/
+        '' ];
+    };
   };
 }

diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index 7781928cfa86cf094779e77ca4c8d3df44e92079..e0181c4f82a9bcd4d616e654fe818334b690ae92 100644 (file)
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -80,6 +80,32 @@ in {
       ];
     };
 
+    security.acme.certs."eldiron".extraDomains."outils.immae.eu" = null;
+    services.myWebsites.tools.vhostConfs.outils = {
+      certName = "eldiron";
+      hosts    = [ "outils.immae.eu" ];
+      root     = null;
+      extraConfig = [
+        ''
+        RedirectMatch 301 ^/mediagoblin(.*)$ https://mgoblin.immae.eu$1
+
+        RedirectMatch 301 ^/ether(.*)$       https://ether.immae.eu$1
+
+        RedirectMatch 301 ^/nextcloud(.*)$   https://cloud.immae.eu$1
+        RedirectMatch 301 ^/owncloud(.*)$    https://cloud.immae.eu$1
+
+        RedirectMatch 301 ^/carddavmate(.*)$ https://dav.immae.eu/infcloud$1
+        RedirectMatch 301 ^/caldavzap(.*)$   https://dav.immae.eu/infcloud$1
+        RedirectMatch 301 ^/caldav.php(.*)$  https://dav.immae.eu/caldav.php$1
+        RedirectMatch 301 ^/davical(.*)$     https://dav.immae.eu/davical$1
+
+        RedirectMatch 301 ^/taskweb(.*)$     https://task.immae.eu/taskweb$1
+
+        RedirectMatch 301 ^/(.*)$            https://tools.immae.eu/$1
+        ''
+      ];
+    };
+
     services.myPhpfpm.poolConfigs = {
       adminer = adminer.phpFpm.pool;
       ttrss = ttrss.phpFpm.pool;