X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fdefault.nix;h=c366fd29bbb1c9adb4cb159339440a0fe956e5d3;hb=5a61f6ad5164a735be26e016c59e72252ffb49b7;hp=2cc6c8151af8923bef68a4a2c887fd86dd21c928;hpb=8722d69346d5cee802e205e18a2b23d3d4fb4805;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/default.nix b/modules/private/websites/default.nix
index 2cc6c81..c366fd2 100644
--- a/modules/private/websites/default.nix
+++ b/modules/private/websites/default.nix
@@ -3,6 +3,19 @@ let
www_root = "/run/current-system/webapps/_www";
theme_root = "/run/current-system/webapps/_theme";
apacheConfig = {
+ cache = {
+ # This setting permits to ignore time-based cache for files in the
+ # nix store:
+ # If a client requires an If-Modified-Since from timestamp 1, then
+ # this header is removed, and if the response contains a
+ # too old Last-Modified tag, then it is removed too
+ extraConfig = ''
+
+ RequestHeader unset If-Modified-Since
+
+ Header unset Last-Modified "expr=%{LAST_MODIFIED} < 19991231235959"
+ '';
+ };
gzip = {
modules = [ "deflate" "filter" ];
extraConfig = ''
@@ -76,6 +89,14 @@ let
};
makeModules = lib.lists.flatten (lib.attrsets.mapAttrsToList (n: v: v.modules or []) apacheConfig);
makeExtraConfig = (builtins.filter (x: x != null) (lib.attrsets.mapAttrsToList (n: v: v.extraConfig or null) apacheConfig));
+ moomin = let
+ lines = lib.splitString "\n" (lib.fileContents ./moomin.txt);
+ pad = width: str: let
+ padWidth = width - lib.stringLength str;
+ padding = lib.concatStrings (lib.genList (lib.const "0") padWidth);
+ in lib.optionalString (padWidth > 0) padding + str;
+ in
+ lib.imap0 (i: e: ''Header always set "X-Moomin-${pad 2 (builtins.toString i)}" "${e}"'') lines;
in
{
options.myServices.websites.enable = lib.mkEnableOption "enable websites";
@@ -87,27 +108,6 @@ in
users.users.wwwrun.extraGroups = [ "keys" ];
networking.firewall.allowedTCPPorts = [ 80 443 ];
- nixpkgs.overlays = [ (self: super: rec {
- #openssl = self.openssl_1_1;
- php = php72;
- php72 = (super.php72.override {
- config.php.mysqlnd = true;
- config.php.mysqli = false;
- config.php.mhash = true; # Is it needed?
- }).overrideAttrs(old: rec {
- # Didn't manage to build with mysqli + mysql_config connector
- configureFlags = old.configureFlags ++ [
- "--with-mysqli=shared,mysqlnd"
- ];
- # preConfigure = (old.preConfigure or "") + ''
- # export CPPFLAGS="$CPPFLAGS -I${pkgs.mariadb}/include/mysql/server";
- # sed -i -e 's/#include "mysqli_priv.h"/#include "mysqli_priv.h"\n#include /' \
- # ext/mysqli/mysqli.c ext/mysqli/mysqli_prop.c
- # '';
- });
- phpPackages = super.php72Packages.override { inherit php; };
- }) ];
-
secrets.keys = [{
dest = "apache-ldap";
user = "wwwrun";
@@ -135,7 +135,6 @@ in
};
services.phpfpm = {
- phpPackage = pkgs.php;
phpOptions = ''
session.save_path = "/var/lib/php/sessions"
post_max_size = 20M
@@ -178,7 +177,7 @@ in
let ips = config.myEnv.servers.eldiron.ips.integration;
in [ips.ip4] ++ (ips.ip6 or []);
modules = makeModules;
- extraConfig = makeExtraConfig;
+ extraConfig = makeExtraConfig ++ moomin;
fallbackVhost = {
certName = "eldiron";
hosts = ["eldiron.immae.eu" ];
@@ -229,6 +228,10 @@ in
production.enable = true;
};
+ cip-ca = {
+ sympa.enable = true;
+ };
+
connexionswing = {
integration.enable = true;
production.enable = true;
@@ -237,6 +240,8 @@ in
denise = {
evariste.enable = true;
denisejerome.enable = true;
+ oms.enable = true;
+ production.enable = true;
};
emilia.moodle.enable = true;
@@ -289,6 +294,7 @@ in
telio_tortay.production.enable = true;
tools.cloud.enable = true;
+ tools.commento.enable = true;
tools.dav.enable = true;
tools.db.enable = true;
tools.diaspora.enable = true;
@@ -297,8 +303,11 @@ in
tools.mastodon.enable = true;
tools.mediagoblin.enable = true;
tools.peertube.enable = true;
+ tools.performance.enable = true;
tools.tools.enable = true;
tools.email.enable = true;
+
+ games.codenames.enable = true;
};
};
}