X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=nixops%2Fmodules%2Fwebsites%2Fdefault.nix;h=8bbb344c8ee9e83b89c3d973092ce310a1e3dd51;hp=891d917467a1672805b3d4e395fe5e54ad4ed245;hb=8f904d0d982684e8e66dfc5d9123712eb96bf16e;hpb=9129f327844ca58af61a20582b04e35762c63e35

diff --git a/nixops/modules/websites/default.nix b/nixops/modules/websites/default.nix
index 891d917..8bbb344 100644
--- a/nixops/modules/websites/default.nix
+++ b/nixops/modules/websites/default.nix
@@ -288,21 +288,7 @@ in
         '';
       };
       global = {
-        extraConfig = ''
-          ErrorDocument 500 /maintenance_immae.html
-          ErrorDocument 501 /maintenance_immae.html
-          ErrorDocument 502 /maintenance_immae.html
-          ErrorDocument 503 /maintenance_immae.html
-          ErrorDocument 504 /maintenance_immae.html
-          Alias /maintenance_immae.html ${www_root}/maintenance_immae.html
-          ProxyPass /maintenance_immae.html !
-
-          AliasMatch "(.*)/googleb6d69446ff4ca3e5.html" ${www_root}/googleb6d69446ff4ca3e5.html
-          <Directory ${www_root}>
-            AllowOverride None
-            Require all granted
-          </Directory>
-        '';
+        extraConfig = (pkgs.webapps.apache-default.override { inherit www_root;}).apacheConfig;
       };
       apaxy = {
         extraConfig = (pkgs.webapps.apache-theme.override { inherit theme_root; }).apacheConfig;
@@ -336,7 +322,7 @@ in
       adminer = pkgs.callPackage ./commons/adminer.nix {};
     in ''
       mkdir -p $out/webapps
-      ln -s ${../../www} $out/webapps/_www
+      ln -s ${pkgs.webapps.apache-default.www} $out/webapps/_www
       ln -s ${pkgs.webapps.apache-theme.theme} $out/webapps/_theme
       ln -s ${adminer.webRoot} $out/webapps/${adminer.apache.webappName}
       '';