(lib.optionalString config.services.httpd.Inte.enable "systemctl reload httpdInte.service")
(lib.optionalString config.services.nginx.enable "systemctl reload nginx.service")
];
+ extraLegoRenewFlags = [ "--reuse-key" ];
};
description = "Default configuration for certificates";
};
# https://github.com/NixOS/nixpkgs/issues/84633
serviceConfig.RemainAfterExit = lib.mkForce false;
serviceConfig.WorkingDirectory = lib.mkForce "/var/lib/acme/${k}/.lego";
- serviceConfig.StateDirectory = lib.mkForce "acme/${k}/.lego acme/${k}";
+ serviceConfig.StateDirectory = lib.mkForce "acme/${k}/.lego acme/${k} acme/.lego/${k} acme/.lego/accounts";
serviceConfig.ExecStartPost =
let
keyName = builtins.replaceStrings ["*"] ["_"] data.domain;
-F 2 \
-P /run/sympa/wwsympa.pid \
-s /run/sympa/wwsympa.socket \
- -- ${pkgs.sympa}/bin/wwsympa.fcgi
+ -- ${pkgs.sympa}/lib/sympa/cgi/wwsympa.fcgi
'';
StateDirectory = "sympa";
ProtectHome = true;
args = [
"flags=hqRu"
"user=sympa"
- "argv=${pkgs.sympa}/bin/queue"
+ "argv=${pkgs.sympa}/libexec/queue"
"\${nexthop}"
];
};
args = [
"flags=hqRu"
"user=sympa"
- "argv=${pkgs.sympa}/bin/bouncequeue"
+ "argv=${pkgs.sympa}/libexec/bouncequeue"
"\${nexthop}"
];
};
"pm.max_children" = "5";
"pm.process_idle_timeout" = "60";
};
- phpOptions = config.services.phpfpm.phpOptions + ''
- extension=${pkgs.php72}/lib/php/extensions/mysqli.so
- '';
phpPackage = pkgs.php72;
};
system.activationScripts.chloe_integration = {
"pm.min_spare_servers" = "1";
"pm.max_spare_servers" = "3";
};
- phpOptions = config.services.phpfpm.phpOptions + ''
- extension=${pkgs.php72}/lib/php/extensions/mysqli.so
- '';
phpPackage = pkgs.php72;
};
system.activationScripts.chloe_production = {
users.users.wwwrun.extraGroups = [ "keys" ];
networking.firewall.allowedTCPPorts = [ 80 443 ];
- nixpkgs.overlays = [ (self: super: rec {
- 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 <mysql_version.h>/' \
- # ext/mysqli/mysqli.c ext/mysqli/mysqli_prop.c
- # '';
- });
- }) ];
-
secrets.keys = [{
dest = "apache-ldap";
user = "wwwrun";
postInstall = let
nodeHeaders = fetchurl {
url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
- sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76";
+ sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj";
};
in
''
"pm.min_spare_servers" = "1";
"pm.max_spare_servers" = "3";
};
- phpOptions = config.services.phpfpm.phpOptions + ''
- extension=${pkgs.php72}/lib/php/extensions/mysqli.so
- '';
phpPackage = pkgs.php72;
};
system.activationScripts.isabelle_iridologie = {
phpEnv = {
BDD_CONNECT = secretsPath;
};
- phpOptions = config.services.phpfpm.phpOptions + ''
- extension=${pkgs.php72}/lib/php/extensions/mysqli.so
- '';
phpPackage = pkgs.php72;
};
services.websites.env.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ];
};
phpOptions = config.services.phpfpm.phpOptions + ''
date.timezone = 'Europe/Paris'
- extension=${pkgs.php72}/lib/php/extensions/mysqli.so
- '';
+ '';
phpPackage = pkgs.php72;
};
};
phpOptions = config.services.phpfpm.phpOptions + ''
date.timezone = 'Europe/Paris'
- extension=${pkgs.php72}/lib/php/extensions/mysqli.so
'';
phpPackage = pkgs.php72;
};
};
phpOptions = config.services.phpfpm.phpOptions + ''
disable_functions = "mail"
- extension=${pkgs.php72}/lib/php/extensions/mysqli.so
- '';
+ '';
phpPackage = pkgs.php72;
};
services.websites.env.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ];
basedir = builtins.concatStringsSep ":" (
[ nextcloud varDir ]
++ builtins.attrValues pkgs.webapps.nextcloud-apps);
- phpConfig = ''
- extension=${pkgs.php72Packages.redis}/lib/php/extensions/redis.so
- extension=${pkgs.php72Packages.apcu}/lib/php/extensions/apcu.so
- zend_extension=${pkgs.php72}/lib/php/extensions/opcache.so
- '';
pool = {
"listen.owner" = "wwwrun";
"listen.group" = "wwwrun";
"php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:${basedir}:/proc/meminfo:/dev/urandom:/proc/self/fd:/tmp";
"php_admin_value[session.save_path]" = "${varDir}/phpSessions";
};
- phpPackage = pkgs.php72;
+ phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.redis e.apcu e.opcache ]);
};
in {
options.myServices.websites.tools.cloud = {
user = "wwwrun";
group = "wwwrun";
settings = phpFpm.pool;
- phpOptions = config.services.phpfpm.phpOptions + phpFpm.phpConfig;
- phpPackage = pkgs.php72;
+ phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.redis e.apcu e.opcache ]);
};
services.cron = {
settings = roundcubemail.phpFpm.pool;
phpOptions = config.services.phpfpm.phpOptions + ''
date.timezone = 'CET'
- extension=${pkgs.php72Packages.imagick}/lib/php/extensions/imagick.so
'';
- phpPackage = pkgs.php72;
+ phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.imagick ]);
};
services.phpfpm.pools.rainloop = {
user = "wwwrun";
"php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp";
};
- phpOptions = config.services.phpfpm.phpOptions + ''
- extension=${pkgs.php72}/lib/php/extensions/mysqli.so
- extension=${pkgs.php72Packages.redis}/lib/php/extensions/redis.so
- extension=${pkgs.php72Packages.apcu}/lib/php/extensions/apcu.so
- zend_extension=${pkgs.php72}/lib/php/extensions/opcache.so
- '';
- phpPackage = pkgs.php72;
+ phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [e.mysqli e.redis e.apcu e.opcache ]);
};
adminer = adminer.phpFpm;
ttrss = {
group = "wwwrun";
settings = dmarc-reports.phpFpm.pool;
phpEnv = dmarc-reports.phpFpm.phpEnv;
- phpOptions = config.services.phpfpm.phpOptions + ''
- extension=${pkgs.php72}/lib/php/extensions/mysqli.so
- '';
phpPackage = pkgs.php72;
};
dokuwiki = {
"homepage": "https://github.com/NixOS/nixpkgs",
"owner": "NixOS",
"repo": "nixpkgs-channels",
- "rev": "ae6bdcc53584aaf20211ce1814bea97ece08a248",
- "sha256": "0hjhznns1cxgl3hww2d5si6vhy36pnm53hms9h338v6r633dcy77",
+ "rev": "fce7562cf46727fdaf801b232116bc9ce0512049",
+ "sha256": "14rvi69ji61x3z88vbn17rg5vxrnw2wbnanxb7y0qzyqrj7spapx",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs-channels/archive/ae6bdcc53584aaf20211ce1814bea97ece08a248.tar.gz",
+ "url": "https://github.com/NixOS/nixpkgs-channels/archive/fce7562cf46727fdaf801b232116bc9ce0512049.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs-nixops-next": {
sc-im = import ./sc-im;
shaarli = import ./shaarli;
slrn = import ./slrn;
- sympa = import ./sympa;
taskwarrior = import ./taskwarrior;
vcsh = import ./vcsh;
weboob = import ./weboob;
+++ /dev/null
-self: super: {
- sympa = super.sympa.overrideAttrs(old: {
- # https://github.com/NixOS/nixpkgs/pull/83258/files
- src = self.fetchFromGitHub {
- owner = "sympa-community";
- repo = "sympa";
- rev = "6.2.54";
- sha256 = "07wfvr8rrg7pwkl2zglrdri7n42rl9gwrjbaffb8m37wq67s7fca";
- };
- #configureFlags = ["--enable-fhs"] ++ old.configureFlags;
- });
-}
'';
nodeHeaders = fetchurl {
url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
- sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76";
+ sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj";
};
buildslist_yarn = yarn2nix-moretea.mkYarnModules rec {
name = "buildslist-yarn-modules";
let
nodeHeaders = fetchurl {
url = "https://nodejs.org/download/release/v${nodejs.version}/node-v${nodejs.version}-headers.tar.gz";
- sha256 = "1df3yhlwlvai0m9kvjyknjg11hnw0kj0rnhyzbwvsfjnmr6z8r76";
+ sha256 = "1prvrcvbyal39k9axfwjixs4wfgs1m8xy4prsl0kq0s0n7r7nxzj";
};
source = mylibs.fetchedGithub ./peertube.json;
patchedSource = stdenv.mkDerivation (source // rec {