X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Ftools%2Ftools%2Fdefault.nix;h=ac92ef48f33d5407bc58f6665f2d5634ef8e407d;hp=64642061f4c1681342e2513ff9f5dce0a9856533;hb=a9f52ec521e45204ad9363dd143b32ac9910b6b3;hpb=e4e0de77cd6c9882fa7ff7c3cdd0ed9fce8a59d8
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix
index 6464206..ac92ef4 100644
--- a/modules/private/websites/tools/tools/default.nix
+++ b/modules/private/websites/tools/tools/default.nix
@@ -1,5 +1,7 @@
{ lib, pkgs, config, ... }:
let
+ flakeCompat = import ../../../../../lib/flake-compat.nix;
+
adminer = pkgs.callPackage ./adminer.nix {
inherit (pkgs.webapps) adminer;
};
@@ -64,6 +66,9 @@ let
cfg = config.myServices.websites.tools.tools;
pcfg = config.services.phpfpm.pools;
in {
+ imports =
+ builtins.attrValues (flakeCompat ../../../../../flakes/private/paste).nixosModules;
+
options.myServices.websites.tools.tools = {
enable = lib.mkEnableOption "enable tools website";
};
@@ -165,13 +170,16 @@ in {
(phpbb.apache.vhostConf pcfg.phpbb.socket)
(dmarc-reports.apache.vhostConf pcfg.dmarc-reports.socket)
''
- Alias /paste /var/lib/fiche
-
- DirectoryIndex index.txt index.html
- AllowOverride None
- Require all granted
- Options -Indexes
-
+
+ ProxyPass unix://${config.services.paste.sockets.gunicorn}|http://tools.immae.eu/paste/
+ ProxyPassReverse unix://${config.services.paste.sockets.gunicorn}|http://tools.immae.eu/paste/
+ ProxyPreserveHost on
+
+
+ ProxyPass unix://${config.services.paste.sockets.gunicorn}|http://tools.immae.eu/paste/
+ ProxyPassReverse unix://${config.services.paste.sockets.gunicorn}|http://tools.immae.eu/paste/
+ ProxyPreserveHost on
+
Alias /BIP39 /var/lib/buildbot/outputs/immae/bip39
@@ -437,12 +445,6 @@ in {
paths = [ "/var/secrets/webapps/tools-wallabag" ];
};
- services.fiche = {
- enable = true;
- port = config.myEnv.ports.fiche;
- domain = "tools.immae.eu/paste";
- https = true;
- };
};
}