X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=46a28e70a1cdaa5ebdba92bb47a93a5510ca421d;hb=b639cc33725fed62988b616909843bea7f7aebe3;hp=6f27b0be818d1b648dc94e1e42c3d8139efd4828;hpb=6a8252b11bb02f3e67857d5a9d733b1affa6a625;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 6f27b0b..46a28e7 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -1,42 +1,46 @@
-{ lib, pkgs, config, myconfig, ... }:
+{ lib, pkgs, config, ... }:
let
adminer = pkgs.callPackage ./adminer.nix {
inherit (pkgs.webapps) adminer;
};
ympd = pkgs.callPackage ./ympd.nix {
- env = myconfig.env.tools.ympd;
+ env = config.myEnv.tools.ympd;
};
ttrss = pkgs.callPackage ./ttrss.nix {
inherit (pkgs.webapps) ttrss ttrss-plugins;
- env = myconfig.env.tools.ttrss;
+ env = config.myEnv.tools.ttrss;
};
kanboard = pkgs.callPackage ./kanboard.nix {
- env = myconfig.env.tools.kanboard;
+ env = config.myEnv.tools.kanboard;
};
wallabag = pkgs.callPackage ./wallabag.nix {
inherit (pkgs.webapps) wallabag;
- env = myconfig.env.tools.wallabag;
+ env = config.myEnv.tools.wallabag;
};
yourls = pkgs.callPackage ./yourls.nix {
inherit (pkgs.webapps) yourls yourls-plugins;
- env = myconfig.env.tools.yourls;
+ env = config.myEnv.tools.yourls;
};
rompr = pkgs.callPackage ./rompr.nix {
inherit (pkgs.webapps) rompr;
- env = myconfig.env.tools.rompr;
+ env = config.myEnv.tools.rompr;
};
shaarli = pkgs.callPackage ./shaarli.nix {
- env = myconfig.env.tools.shaarli;
+ env = config.myEnv.tools.shaarli;
};
dokuwiki = pkgs.callPackage ./dokuwiki.nix {
inherit (pkgs.webapps) dokuwiki dokuwiki-plugins;
};
ldap = pkgs.callPackage ./ldap.nix {
inherit (pkgs.webapps) phpldapadmin;
- env = myconfig.env.tools.phpldapadmin;
+ env = config.myEnv.tools.phpldapadmin;
+ };
+ grocy = pkgs.callPackage ./grocy.nix {
+ inherit (pkgs.webapps) grocy;
};
cfg = config.myServices.websites.tools.tools;
+ pcfg = config.services.phpfpm.pools;
in {
options.myServices.websites.tools.tools = {
enable = lib.mkEnableOption "enable tools website";
@@ -51,8 +55,9 @@ in {
++ wallabag.keys
++ yourls.keys;
- services.backup.profiles = {
+ services.duplyBackup.profiles = {
dokuwiki = dokuwiki.backups;
+ grocy = grocy.backups;
kanboard = kanboard.backups;
rompr = rompr.backups;
shaarli = shaarli.backups;
@@ -74,18 +79,21 @@ in {
++ kanboard.apache.modules;
services.websites.env.integration.vhostConfs.devtools = {
- certName = "eldiron";
- addToCerts = true;
- hosts = ["devtools.immae.eu" ];
- root = "/var/lib/ftp/devtools.immae.eu";
- extraConfig = [
+ certName = "integration";
+ certMainHost = "devtools.immae.eu";
+ addToCerts = true;
+ hosts = [ "devtools.immae.eu" ];
+ root = "/var/lib/ftp/devtools.immae.eu";
+ extraConfig = [
''
+ Timeout 600
+ ProxyTimeout 600
DirectoryIndex index.php index.htm index.html
AllowOverride all
Require all granted
- SetHandler "proxy:unix:/var/run/phpfpm/devtools.sock|fcgi://localhost"
+ SetHandler "proxy:unix:${pcfg.devtools.socket}|fcgi://localhost"
''
@@ -99,27 +107,30 @@ in {
root = "/var/lib/ftp/tools.immae.eu";
extraConfig = [
''
+ RedirectMatch 301 ^/vpn(.*)$ https://vpn.immae.eu$1
RedirectMatch 301 ^/roundcube(.*)$ https://mail.immae.eu/roundcube$1
+ RedirectMatch 301 ^/jappix(.*)$ https://im.immae.fr/converse
DirectoryIndex index.php index.htm index.html
AllowOverride all
Require all granted
- SetHandler "proxy:unix:/var/run/phpfpm/tools.sock|fcgi://localhost"
+ SetHandler "proxy:unix:${pcfg.tools.socket}|fcgi://localhost"
''
- adminer.apache.vhostConf
+ (adminer.apache.vhostConf pcfg.adminer.socket)
ympd.apache.vhostConf
- ttrss.apache.vhostConf
- wallabag.apache.vhostConf
- yourls.apache.vhostConf
- rompr.apache.vhostConf
- shaarli.apache.vhostConf
- dokuwiki.apache.vhostConf
- ldap.apache.vhostConf
- kanboard.apache.vhostConf
+ (ttrss.apache.vhostConf pcfg.ttrss.socket)
+ (wallabag.apache.vhostConf pcfg.wallabag.socket)
+ (yourls.apache.vhostConf pcfg.yourls.socket)
+ (rompr.apache.vhostConf pcfg.rompr.socket)
+ (shaarli.apache.vhostConf pcfg.shaarli.socket)
+ (dokuwiki.apache.vhostConf pcfg.dokuwiki.socket)
+ (ldap.apache.vhostConf pcfg.ldap.socket)
+ (kanboard.apache.vhostConf pcfg.kanboard.socket)
+ (grocy.apache.vhostConf pcfg.grocy.socket)
];
};
@@ -146,6 +157,10 @@ in {
RedirectMatch 301 ^/roundcube(.*)$ https://mail.immae.eu/roundcube$1
+ RedirectMatch 301 ^/jappix(.*)$ https://im.immae.fr/converse
+
+ RedirectMatch 301 ^/vpn(.*)$ https://vpn.immae.eu$1
+
RedirectMatch 301 ^/(.*)$ https://tools.immae.eu/$1
''
];
@@ -210,59 +225,97 @@ in {
paths = [ "/var/secrets/mpd" ];
};
- services.phpfpm.pools.devtools = {
- listen = "/var/run/phpfpm/devtools.sock";
- extraConfig = ''
- user = wwwrun
- group = wwwrun
- listen.owner = wwwrun
- listen.group = wwwrun
- pm = dynamic
- pm.max_children = 60
- pm.start_servers = 2
- pm.min_spare_servers = 1
- pm.max_spare_servers = 10
+ services.phpfpm.pools = {
+ tools = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = {
+ "listen.owner" = "wwwrun";
+ "listen.group" = "wwwrun";
+ "pm" = "dynamic";
+ "pm.max_children" = "60";
+ "pm.start_servers" = "2";
+ "pm.min_spare_servers" = "1";
+ "pm.max_spare_servers" = "10";
- 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
- '';
- };
-
- services.phpfpm.poolConfigs = {
- adminer = adminer.phpFpm.pool;
- ttrss = ttrss.phpFpm.pool;
- wallabag = wallabag.phpFpm.pool;
- yourls = yourls.phpFpm.pool;
- rompr = rompr.phpFpm.pool;
- shaarli = shaarli.phpFpm.pool;
- dokuwiki = dokuwiki.phpFpm.pool;
- ldap = ldap.phpFpm.pool;
- kanboard = kanboard.phpFpm.pool;
- tools = ''
- listen = /var/run/phpfpm/tools.sock
- user = wwwrun
- group = wwwrun
- listen.owner = wwwrun
- listen.group = wwwrun
- pm = dynamic
- pm.max_children = 60
- pm.start_servers = 2
- pm.min_spare_servers = 1
- pm.max_spare_servers = 10
+ # Needed to avoid clashes in browser cookies (same domain)
+ "php_value[session.name]" = "ToolsPHPSESSID";
+ "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/tools.immae.eu:/tmp";
+ };
+ };
+ devtools = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = {
+ "listen.owner" = "wwwrun";
+ "listen.group" = "wwwrun";
+ "pm" = "dynamic";
+ "pm.max_children" = "60";
+ "pm.start_servers" = "2";
+ "pm.min_spare_servers" = "1";
+ "pm.max_spare_servers" = "10";
- ; Needed to avoid clashes in browser cookies (same domain)
- php_value[session.name] = ToolsPHPSESSID
- php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/tools.immae.eu:/tmp"
- '';
+ "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
+ '';
+ };
+ adminer = adminer.phpFpm;
+ ttrss = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = ttrss.phpFpm.pool;
+ };
+ wallabag = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = wallabag.phpFpm.pool;
+ };
+ yourls = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = yourls.phpFpm.pool;
+ };
+ rompr = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = rompr.phpFpm.pool;
+ };
+ shaarli = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = shaarli.phpFpm.pool;
+ };
+ dokuwiki = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = dokuwiki.phpFpm.pool;
+ };
+ ldap = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = ldap.phpFpm.pool;
+ phpPackage = pkgs.php74;
+ };
+ kanboard = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = kanboard.phpFpm.pool;
+ };
+ grocy = {
+ user = "wwwrun";
+ group = "wwwrun";
+ settings = grocy.phpFpm.pool;
+ };
};
system.activationScripts = {
adminer = adminer.activationScript;
+ grocy = grocy.activationScript;
ttrss = ttrss.activationScript;
wallabag = wallabag.activationScript;
yourls = yourls.activationScript;
@@ -283,6 +336,7 @@ in {
"${wallabag.apache.webappName}" = wallabag.webRoot;
"${yourls.apache.webappName}" = yourls.webRoot;
"${kanboard.apache.webappName}" = kanboard.webRoot;
+ "${grocy.apache.webappName}" = grocy.webRoot;
};
services.websites.env.tools.watchPaths = [