X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Feldiron.nix;h=68eddf607446c5630f46ac13b9659271893c6377;hb=6c672f344e2de6852cfa97ed789726bcd54cc83c;hp=d88dd9310ffea3a0670a632c14bb84df0d5e15ea;hpb=b7cd7e4b3eae30b588c6e3a75e5a658f09ca8269;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index d88dd93..68eddf6 100644
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -13,7 +13,16 @@
     in
   {
     nixpkgs.config.packageOverrides = oldpkgs: rec {
-      gitolite = nixpkgs_unstable.gitolite;
+      gitolite = oldpkgs.gitolite.overrideAttrs(old: rec {
+        name = "gitolite-${version}";
+        version = "3.6.10";
+        src = pkgs.fetchFromGitHub {
+          owner = "sitaramc";
+          repo = "gitolite";
+          rev = "v${version}";
+          sha256 = "0p2697mn6rwm03ndlv7q137zczai82n41aplq1g006ii7f12xy8h";
+        };
+      });
       gitweb = oldpkgs.gitweb.overrideAttrs(old: {
         installPhase = old.installPhase + ''
           cp -r ${./packages/gitweb} $out/gitweb-theme;
@@ -80,6 +89,8 @@
     ];
 
     security.acme.certs = {
+      # /!\ To create a new certificate, add first the domain to an
+      # existing certificate, deploy, and then use it in httpd.
       "eldiron" = {
         webroot = "/var/lib/acme/acme-challenge";
         email = "ismael@bouya.org";
@@ -95,6 +106,32 @@
           "connexionswing.immae.eu" = null;
           "sandetludo.immae.eu" = null;
           "cloud.immae.eu" = null;
+          "ludivine.immae.eu" = null;
+          "dev.aten.pro" = null;
+        };
+      };
+      "ludivinecassal" = {
+        webroot = "/var/lib/acme/acme-challenge";
+        email = "ismael@bouya.org";
+        domain = "ludivinecassal.com";
+        plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" ];
+        postRun = ''
+          systemctl reload httpd.service
+        '';
+        extraDomains = {
+          "www.ludivinecassal.com" = null;
+        };
+      };
+      "aten" = {
+        webroot = "/var/lib/acme/acme-challenge";
+        email = "ismael@bouya.org";
+        domain = "aten.pro";
+        plugins = [ "cert.pem" "chain.pem" "fullchain.pem" "full.pem" "key.pem" "account_key.json" ];
+        postRun = ''
+          systemctl reload httpd.service
+        '';
+        extraDomains = {
+          "www.aten.pro" = null;
         };
       };
       # "connexionswing" = {
@@ -163,6 +200,10 @@
         adminer = mypkgs.adminer.phpFpm.pool;
         connexionswing_dev = mypkgs.connexionswing_dev.phpFpm.pool;
         connexionswing_prod = mypkgs.connexionswing_prod.phpFpm.pool;
+        ludivinecassal_dev = mypkgs.ludivinecassal_dev.phpFpm.pool;
+        ludivinecassal_prod = mypkgs.ludivinecassal_prod.phpFpm.pool;
+        aten_dev = mypkgs.aten_dev.phpFpm.pool;
+        aten_prod = mypkgs.aten_prod.phpFpm.pool;
         nextcloud = mypkgs.nextcloud.phpFpm.pool;
         mantisbt = mypkgs.mantisbt.phpFpm.pool;
       };
@@ -171,6 +212,10 @@
     system.activationScripts = {
       connexionswing_dev  = mypkgs.connexionswing_dev.activationScript;
       connexionswing_prod = mypkgs.connexionswing_prod.activationScript;
+      ludivinecassal_dev  = mypkgs.ludivinecassal_dev.activationScript;
+      ludivinecassal_prod  = mypkgs.ludivinecassal_prod.activationScript;
+      aten_dev  = mypkgs.aten_dev.activationScript;
+      aten_prod = mypkgs.aten_prod.activationScript;
       nextcloud = mypkgs.nextcloud.activationScript;
       httpd = ''
         install -d -m 0755 /var/lib/acme/acme-challenge
@@ -294,6 +339,10 @@
         mypkgs.nextcloud.apache.modules ++
         mypkgs.connexionswing_dev.apache.modules ++
         mypkgs.connexionswing_prod.apache.modules ++
+        mypkgs.ludivinecassal_dev.apache.modules ++
+        mypkgs.ludivinecassal_prod.apache.modules ++
+        mypkgs.aten_dev.apache.modules ++
+        mypkgs.aten_prod.apache.modules ++
         mypkgs.ympd.apache.modules ++
         mypkgs.git.web.apache.modules ++
         mypkgs.mantisbt.apache.modules ++
@@ -332,6 +381,36 @@
             mypkgs.connexionswing_dev.apache.vhostConf
           ];
         })
+        (withConf "eldiron" // {
+          hostName = "ludivine.immae.eu";
+          documentRoot = mypkgs.ludivinecassal_dev.webRoot;
+          extraConfig = builtins.concatStringsSep "\n" [
+            mypkgs.ludivinecassal_dev.apache.vhostConf
+          ];
+        })
+        (withConf "ludivinecassal" // {
+          hostName = "ludivinecassal.com";
+          serverAliases = [ "www.ludivinecassal.com" ];
+          documentRoot = mypkgs.ludivinecassal_prod.webRoot;
+          extraConfig = builtins.concatStringsSep "\n" [
+            mypkgs.ludivinecassal_prod.apache.vhostConf
+          ];
+        })
+        (withConf "eldiron" // {
+          hostName = "dev.aten.pro";
+          documentRoot = mypkgs.aten_dev.webRoot;
+          extraConfig = builtins.concatStringsSep "\n" [
+            mypkgs.aten_dev.apache.vhostConf
+          ];
+        })
+        (withConf "aten" // {
+          hostName = "aten.pro";
+          serverAliases = [ "www.aten.pro" ];
+          documentRoot = mypkgs.aten_prod.webRoot;
+          extraConfig = builtins.concatStringsSep "\n" [
+            mypkgs.aten_prod.apache.vhostConf
+          ];
+        })
         (withConf "eldiron" // {
           hostName = "cloud.immae.eu";
           documentRoot = mypkgs.nextcloud.webRoot;