summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/services/web/money/default.nix2
-rw-r--r--config/services/web/quentin/default.nix4
-rw-r--r--config/services/web/searx/default.nix2
-rw-r--r--config/services/web/searx/morty/default.nix2
-rw-r--r--config/services/web/searx/searx/default.nix4
-rw-r--r--config/services/web/searx/searx/engines.nix3
6 files changed, 8 insertions, 9 deletions
diff --git a/config/services/web/money/default.nix b/config/services/web/money/default.nix
index ce8ceea..1853aab 100644
--- a/config/services/web/money/default.nix
+++ b/config/services/web/money/default.nix
@@ -2,7 +2,7 @@
let cfg = config.services.ihatemoney;
in {
- services.nginx.virtualHosts."money.aristote.fr" = lib.mkIf cfg.enable {
+ services.nginx.virtualHosts."money.${config.networking.domain}" = lib.mkIf cfg.enable {
forceSSL = true;
enableACME = true;
locations."/".proxyPass = "http://127.0.0.1${cfg.uwsgiConfig.http}/";
diff --git a/config/services/web/quentin/default.nix b/config/services/web/quentin/default.nix
index da21d59..468dec4 100644
--- a/config/services/web/quentin/default.nix
+++ b/config/services/web/quentin/default.nix
@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
{
- services.nginx.virtualHosts."quentin.aristote.fr" = {
+ services.nginx.virtualHosts."quentin.${config.networking.domain}" = {
locations."/".root = "${pkgs.personal.academic-webpage}";
forceSSL = true;
enableACME = true;
diff --git a/config/services/web/searx/default.nix b/config/services/web/searx/default.nix
index 3db37c6..1953db7 100644
--- a/config/services/web/searx/default.nix
+++ b/config/services/web/searx/default.nix
@@ -8,7 +8,7 @@ let
in {
imports = [ ./searx ./filtron ./morty ];
- services.nginx.virtualHosts."searx.aristote.fr" =
+ services.nginx.virtualHosts."searx.${config.networking.domain}" =
lib.mkIf (cfg.searx.enable && cfg.filtron.enable) {
locations = {
"/" = {
diff --git a/config/services/web/searx/morty/default.nix b/config/services/web/searx/morty/default.nix
index 8eeede8..1920701 100644
--- a/config/services/web/searx/morty/default.nix
+++ b/config/services/web/searx/morty/default.nix
@@ -2,7 +2,7 @@
let cfg = config.services.morty;
in {
- services.nginx.virtualHosts."searx.aristote.fr".locations =
+ services.nginx.virtualHosts."searx.${config.networking.domain}".locations =
lib.mkIf cfg.enable {
"/morty/" = {
proxyPass = "http://127.0.0.1:${toString cfg.port}";
diff --git a/config/services/web/searx/searx/default.nix b/config/services/web/searx/searx/default.nix
index c855c5a..85e0d40 100644
--- a/config/services/web/searx/searx/default.nix
+++ b/config/services/web/searx/searx/default.nix
@@ -22,7 +22,7 @@ in {
use_default_settings = true;
general = {
debug = false;
- contact_url = "mailto:quentin@aristote.fr";
+ contact_url = "mailto:quentin@${config.networking.domain}";
enable_stats = false;
};
search = {
@@ -37,7 +37,7 @@ in {
};
ui = { theme_args = { oscar_style = "pointhi"; }; };
result_proxy = lib.mkIf cfg.morty.enable {
- url = "http://searx.aristote.fr/morty";
+ url = "http://searx.${config.networking.domain}/morty";
key = ''!!binary | "${cfg.morty.key}"'';
};
enabled_plugins = [
diff --git a/config/services/web/searx/searx/engines.nix b/config/services/web/searx/searx/engines.nix
index a69ff2b..2d9a67f 100644
--- a/config/services/web/searx/searx/engines.nix
+++ b/config/services/web/searx/searx/engines.nix
@@ -74,7 +74,7 @@ in {
baseUrl = "https://alternativeto.net/browse/search";
queryKeyword = "q";
pageKeyword = "p";
- preventRedirect = true;
+ extraParameters = { ignoreExactMatch = "true"; };
};
results_xpath = ''
//article[@class="row app-list-item"]/div[@class="col-xs-10 col-sm-10 col-md-11 col-lg-offset-1 col-lg-11"]'';
@@ -100,7 +100,6 @@ in {
search_url = makeSearchUrl {
baseUrl = "https://emojipedia.org/search/";
queryKeyword = "q";
- preventRedirect = true;
};
results_xpath = ''//ol[@class="search-results"]/li'';
url_xpath = "./h2/a/@href";