X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fdefault.nix;h=2fdd18f8350b4524efe4ad8d1085bdab8d546680;hb=cc0ec972ee21b296ca382939350605cb2483aefd;hp=37e6d65a8a06982d213ea6ee5c5a2088007835f8;hpb=27da4e101d0180251762f93aace5aec112b6c7af;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix
index 37e6d65..2fdd18f 100644
--- a/modules/private/websites/default.nix
+++ b/modules/private/websites/default.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, config, ... }:
 let
   www_root = ./_www;
-  theme_root = pkgs.webapps.apache-theme.theme;
+  theme_root = (pkgs.webapps.apache-theme {}).theme;
   apacheConfig = {
     cache = {
       # This setting permits to ignore time-based cache for files in the
@@ -73,7 +73,7 @@ let
       '';
     };
     apaxy = {
-      extraConfig = (pkgs.webapps.apache-theme.override { inherit theme_root; }).apacheConfig;
+      extraConfig = (pkgs.webapps.apache-theme { inherit theme_root; }).apacheConfig;
     };
     http2 = {
       modules = [ "http2" ];
@@ -102,6 +102,27 @@ in
   options.myServices.websites.enable = lib.mkEnableOption "enable websites";
 
   config = lib.mkIf config.myServices.websites.enable {
+    myServices.chatonsProperties.hostings.web = {
+      file.datetime = "2022-08-22T01:30:00";
+      hosting = {
+        name = "Hébergement Web";
+        description = "Service d'hébergement web avec php/mysql/postgresql";
+        website = "https://www.immae.eu";
+        status.level = "OK";
+        status.description = "OK";
+        registration.load = "OPEN";
+        install.type = "PACKAGE";
+      };
+      software = {
+        name = "Apache Httpd";
+        website = "https://httpd.apache.org/";
+        license.url = "https://www.apache.org/licenses/";
+        license.name = "Apache License Version 2";
+        version = pkgs.apacheHttpd.version;
+        source.url = "https://httpd.apache.org/download.cgi";
+        modules = "openssh,pure-ftpd";
+      };
+    };
     users.users.wwwrun.extraGroups = [ "keys" ];
     networking.firewall.allowedTCPPorts = [ 80 443 ];
 
@@ -154,7 +175,7 @@ in
       httpdName = "Prod";
       ips =
         let ips = config.myEnv.servers.eldiron.ips.production;
-        in [ips.ip4] ++ (ips.ip6 or []);
+        in (ips.ip4 or []) ++ (ips.ip6 or []);
       modules = makeModules;
       extraConfig = makeExtraConfig;
       fallbackVhost = {
@@ -171,11 +192,11 @@ in
       httpdName = "Inte";
       ips =
         let ips = config.myEnv.servers.eldiron.ips.integration;
-        in [ips.ip4] ++ (ips.ip6 or []);
+        in (ips.ip4 or []) ++ (ips.ip6 or []);
       modules = makeModules;
       extraConfig = makeExtraConfig ++ moomin;
       fallbackVhost = {
-        certName    = "eldiron";
+        certName    = "integration";
         hosts       = ["eldiron.immae.eu" ];
         root        = www_root;
         extraConfig = [ "DirectoryIndex index.htm" ];
@@ -188,7 +209,7 @@ in
       httpdName = "Tools";
       ips =
         let ips = config.myEnv.servers.eldiron.ips.main;
-        in [ips.ip4] ++ (ips.ip6 or []);
+        in (ips.ip4 or []) ++ (ips.ip6 or []);
       modules = makeModules;
       extraConfig = makeExtraConfig ++
         [ ''
@@ -212,12 +233,16 @@ in
       };
     };
 
+    myServices.tools.kanboard.farm.instances.tonnelle = {};
+    myServices.tools.kanboard.farm.instances.gebull = {};
     myServices.websites = {
+      attilax.dolibarr.enable = true;
+
       bakeer.cloud.enable = true;
       capitaines.landing_pages.enable = true;
 
       chloe = {
-        integration.enable = true;
+        new.enable = true;
         production.enable = true;
       };
 
@@ -225,6 +250,7 @@ in
         website.enable = true;
         agorakit.enable = true;
         agora-project.enable = true;
+        ateliersduchangement.enable = true;
       };
 
       cip-ca = {
@@ -247,7 +273,7 @@ in
 
       emilia = {
         moodle.enable = false;
-        atelierfringant.enable = true;
+        atelierfringant.enable = false;
       };
 
       florian = {
@@ -260,6 +286,7 @@ in
         production.enable = true;
         release.enable = true;
         temp.enable = true;
+        dolibarr.enable = true;
       };
 
       isabelle = {
@@ -272,6 +299,13 @@ in
 
       leila.production.enable = true;
 
+      librezo = {
+        cloud.enable = true;
+        dolibarr.enable = true;
+        dolibarrDev.enable = true;
+        website.enable = true;
+      };
+
       ludivine = {
         integration.enable = true;
         production.enable = true;
@@ -279,21 +313,25 @@ in
 
       nassime.production.enable = true;
 
-      nath.villon.enable = true;
-
       nicecoop = {
         gestion-compte.enable = true;
         gestion-compte-integration.enable = true;
         odoo.enable = true;
+        dolibarrDev.enable = true;
         copanier.enable = true;
       };
+
+      noctambules = {
+        cloud.enable = true;
+      };
+
       papa = {
         surveillance.enable = true;
         maison_bbc.enable = true;
       };
 
       patrick_fodella = {
-        ecolyeu.enable = true;
+        ecolyeu.enable = false;
         altermondia.enable = true;
       };