X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Feldiron.nix;h=c1a7761c3802aebebdf98b84045a400b3f78e259;hb=6f0d92b429069069e6d914f25bb30a549526f9d8;hp=71ff57d78fceca7a06efb7b36fac362186bdf3c8;hpb=c5aaa64a9b1b389f10e2885fc4106c2b7926109d;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index 71ff57d..c1a7761 100644 --- a/virtual/eldiron.nix +++ b/virtual/eldiron.nix @@ -42,6 +42,16 @@ cmakeFlags = old.cmakeFlags ++ [ "-DWITH_AUTHENTICATION_PAM=ON" ]; buildInputs = old.buildInputs ++ [ pkgs.pam ]; }); + goaccess = oldpkgs.goaccess.overrideAttrs(old: rec { + name = "goaccess-${version}"; + version = "1.3"; + src = pkgs.fetchurl { + url = "https://tar.goaccess.io/${name}.tar.gz"; + sha256 = "16vv3pj7pbraq173wlxa89jjsd279004j4kgzlrsk1dz4if5qxwc"; + }; + configureFlags = old.configureFlags ++ [ "--enable-tcb=btree" ]; + buildInputs = old.buildInputs ++ [ pkgs.tokyocabinet pkgs.bzip2 ]; + }); }; networking = { @@ -85,10 +95,13 @@ in [ pkgs.telnet pkgs.vim + pkgs.goaccess occ ]; 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"; @@ -104,6 +117,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" = { @@ -172,6 +211,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; }; @@ -180,6 +223,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 @@ -211,6 +258,10 @@ fi ''; }; + goaccess = '' + mkdir -p /var/lib/goaccess + mkdir -p /var/lib/goaccess/aten.pro + ''; }; environment.etc."ssh/ldap_authorized_keys" = let @@ -277,6 +328,19 @@ AuthBasicProvider ldap + + + Alias /awstats /var/lib/goaccess/%{domain} + + DirectoryIndex index.html + AllowOverride None + Require all granted + + + Use LDAPConnect + Require ldap-group cn=%{domain},ou=stats,cn=httpd,ou=services,dc=immae,dc=eu + + ''; }; http2 = { @@ -288,7 +352,7 @@ customLog = { modules = []; extraConfig = '' - LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %p" combinedVhost + LogFormat "%v:%p %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combinedVhost ''; }; }; @@ -303,6 +367,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 ++ @@ -341,6 +409,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; @@ -455,5 +553,14 @@ #host all all all pam ''; }; + + services.cron = { + enable = true; + systemCronJobs = let + stats = domain: conf: "${pkgs.gnused}/bin/sed -n '/\\['$(LC_ALL=C ${pkgs.coreutils}/bin/date -d yesterday +'%d\\/%b\\/%Y')'/ p' /var/log/httpd/access_log-${domain} | ${pkgs.goaccess}/bin/goaccess -o /var/lib/goaccess/${domain}/index.html -p ${conf}"; + in [ + "5 0 * * * root ${stats "aten.pro" ./packages/aten_goaccess.conf}" + ]; + }; }; }