X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=7903ca55984a51d997d773510e30dbe154796e33;hb=0966f95c6968963988d7ebc846eb0e6087091acc;hp=a5e7f2e6897c6febe41af4804b7ed2d3b7bab8b9;hpb=7df5e532c1ce2ab9e8527615c08c1178990870e6;p=perso%2FImmae%2FConfig%2FNix.git
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index a5e7f2e..7903ca5 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -9,12 +9,17 @@ let
ttrss = pkgs.callPackage ./ttrss.nix {
inherit (pkgs.webapps) ttrss ttrss-plugins;
env = config.myEnv.tools.ttrss;
+ php = pkgs.php72;
};
kanboard = pkgs.callPackage ./kanboard.nix {
env = config.myEnv.tools.kanboard;
};
wallabag = pkgs.callPackage ./wallabag.nix {
- inherit (pkgs.webapps) wallabag;
+ wallabag = pkgs.webapps.wallabag.override {
+ composerEnv = pkgs.composerEnv.override {
+ php = pkgs.php73.withExtensions({ enabled, all }: enabled ++ [all.tidy]);
+ };
+ };
env = config.myEnv.tools.wallabag;
};
yourls = pkgs.callPackage ./yourls.nix {
@@ -36,7 +41,7 @@ let
env = config.myEnv.tools.phpldapadmin;
};
grocy = pkgs.callPackage ./grocy.nix {
- inherit (pkgs.webapps) grocy;
+ grocy = pkgs.webapps.grocy.override { composerEnv = pkgs.composerEnv.override { php = pkgs.php72; }; };
};
phpbb = pkgs.callPackage ./phpbb.nix {
phpbb = (pkgs.webapps.phpbb.withLangs (l: [ l.fr ])).withExts (e: [
@@ -50,6 +55,9 @@ let
dmarc-reports = pkgs.callPackage ./dmarc_reports.nix {
env = config.myEnv.tools.dmarc_reports;
};
+ csp-reports = pkgs.callPackage ./csp_reports.nix {
+ env = config.myEnv.tools.csp_reports;
+ };
landing = pkgs.callPackage ./landing.nix {};
@@ -69,6 +77,7 @@ in {
++ wallabag.keys
++ yourls.keys
++ dmarc-reports.keys
+ ++ csp-reports.keys
++ webhooks.keys;
services.duplyBackup.profiles = {
@@ -107,6 +116,7 @@ in {
''
Timeout 600
ProxyTimeout 600
+ Header always set Content-Security-Policy-Report-Only "${config.myEnv.tools.csp_reports.policies.inline}"
DirectoryIndex index.php index.htm index.html
AllowOverride all
@@ -162,8 +172,8 @@ in {
Options -Indexes
- Alias /BIP39 /var/lib/buildbot/outputs/bip39
-
+ Alias /BIP39 /var/lib/buildbot/outputs/immae/bip39
+
DirectoryIndex index.html
AllowOverride None
Require all granted
@@ -260,7 +270,7 @@ in {
description = "Tiny Tiny RSS feeds update daemon";
serviceConfig = {
User = "wwwrun";
- ExecStart = "${pkgs.php}/bin/php ${ttrss.webRoot}/update.php --daemon";
+ ExecStart = "${pkgs.php72}/bin/php ${ttrss.webRoot}/update.php --daemon";
StandardOutput = "syslog";
StandardError = "syslog";
PermissionsStartOnly = true;
@@ -296,10 +306,12 @@ in {
"/run/wrappers/bin/sendmail" landing "/tmp"
"${config.secrets.location}/webapps/webhooks"
];
+ "include" = "${config.secrets.location}/webapps/tools-csp-reports.conf";
};
phpEnv = {
CONTACT_EMAIL = config.myEnv.tools.contact;
};
+ phpPackage = pkgs.php72;
};
devtools = {
user = "wwwrun";
@@ -315,57 +327,57 @@ in {
"php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp";
};
- phpOptions = config.services.phpfpm.phpOptions + ''
- extension=${pkgs.php}/lib/php/extensions/mysqli.so
- extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
- extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
- zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
- '';
+ phpPackage = pkgs.php72.withExtensions({ enabled, all }: enabled ++ [all.mysqli all.redis all.apcu all.opcache ]);
};
adminer = adminer.phpFpm;
ttrss = {
user = "wwwrun";
group = "wwwrun";
settings = ttrss.phpFpm.pool;
+ phpPackage = pkgs.php72;
};
wallabag = {
user = "wwwrun";
group = "wwwrun";
settings = wallabag.phpFpm.pool;
+ phpPackage = pkgs.php73.withExtensions({ enabled, all }: enabled ++ [all.tidy]);
};
yourls = {
user = "wwwrun";
group = "wwwrun";
settings = yourls.phpFpm.pool;
+ phpPackage = pkgs.php72;
};
rompr = {
user = "wwwrun";
group = "wwwrun";
settings = rompr.phpFpm.pool;
+ phpPackage = pkgs.php72;
};
shaarli = {
user = "wwwrun";
group = "wwwrun";
settings = shaarli.phpFpm.pool;
+ phpPackage = pkgs.php72;
};
dmarc-reports = {
user = "wwwrun";
group = "wwwrun";
settings = dmarc-reports.phpFpm.pool;
phpEnv = dmarc-reports.phpFpm.phpEnv;
- phpOptions = config.services.phpfpm.phpOptions + ''
- extension=${pkgs.php}/lib/php/extensions/mysqli.so
- '';
+ phpPackage = pkgs.php72;
};
dokuwiki = {
user = "wwwrun";
group = "wwwrun";
settings = dokuwiki.phpFpm.pool;
+ phpPackage = pkgs.php72;
};
phpbb = {
user = "wwwrun";
group = "wwwrun";
settings = phpbb.phpFpm.pool;
+ phpPackage = pkgs.php72;
};
ldap = {
user = "wwwrun";
@@ -377,11 +389,13 @@ in {
user = "wwwrun";
group = "wwwrun";
settings = kanboard.phpFpm.pool;
+ phpPackage = pkgs.php72;
};
grocy = {
user = "wwwrun";
group = "wwwrun";
settings = grocy.phpFpm.pool;
+ phpPackage = pkgs.php72;
};
};