From 20466f5e2c254bb0036cca605c2ea9e3db0c5a43 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Tue, 27 Oct 2020 14:05:37 +0100 Subject: [PATCH] searx: use declarative configuration --- configuration.nix | 24 +++++++++++- secrets/default.nix | 89 +++++++++++++++++++++--------------------- secrets/misc/searx.env | 5 +++ 3 files changed, 72 insertions(+), 46 deletions(-) create mode 100644 secrets/misc/searx.env diff --git a/configuration.nix b/configuration.nix index fdf21a3..6b0d9f0 100644 --- a/configuration.nix +++ b/configuration.nix @@ -265,9 +265,29 @@ ### Searx instance services.searx = { enable = true; - configFile = ./assets/searx-settings.yml; - }; + environmentFile = config.secrets.searx.environment; + settings = + { general.instance_name = "searxwell"; + server.port = 8083; + server.base_url = "https://${config.var.hostname}/srx/"; + # Replace DOI links with Sci-Hub + doi_resolver."sci-hub.se" = "https://sci-hub.se/"; + default_doi_resolver = "sci-hub.se"; + + # Use authenticated APIs for some services + engines = [ + { name = "wolframalpha"; + api_key = "@WOLFRAM_API_KEY@"; + engine = "wolframalpha_api"; + } + { name = "youtube"; + api_key = "@YOUTUBE_API_KEY@"; + engine = "youtube_api"; + } + ]; + }; + }; ### Reverse Proxy services.nginx = diff --git a/secrets/default.nix b/secrets/default.nix index 6ba35b2..9cc101d 100644 --- a/secrets/default.nix +++ b/secrets/default.nix @@ -1,44 +1,45 @@ -U2FsdGVkX1/xpt+S+G0n8o2sosRznrRFSybd4hEkXdoFf6BxNryK42UPHKE0e5Hs -EZO3pEVYkK7kxoLqsNZNDVgbIlhfwGKSYVYNJrMBPdwdag0tplqw7F0mU9gLFgHp -edR54IZ1hViSo6NAm+cvh1bIchbDcBV/Cj0ofr5T2T6LI5TrCeIE+huA/rteDr8h -+pey4UJR4ApDjwXjOuL8CBJ8j/TMGkYSsfcWqrBR5E1Sn5NTKK/U+Czv/4PH9Hnp -t+KMTQatjoj+jKpgW3AHFrbo50YUJxornwp+rMBLA1TQDmFEL/9TCkDp5spSYM6r -i99xdnXEG4/tXA3OWqN+CKTYsO5BDlepd3rVqYYcSLhUnZAp07tDNlHtC75wEIsR -xliWFGB4WTCrn+rV/a4xngz33SGGupbvtPPq/cf0EihtsS7D1+pitPVsCMtV8xs9 -19m1MBDQjr3yIAPEj467IIq2pceknhBOpagU1U2q0f4yFBOpyG8x01rFPs6SWmzS -wrWm/iJilcO837/nSAIEnbgoUrwOkdVV891bbxEI5sFYd2/HnCB69R6jptOOiTk1 -dTdwsHxdBPZ50NRoH1n0TZrBN0+bGH7vtdbg3VVjTGLkJkVNUcijZBe4zllWJK+G -pGVIT/WxbdD/wrv6jNZql9YRlxeeYu7P+1D8D6fnafK42jgeYiiXAaJ2xxKIEO0P -cRXMs3DWVzqY1HmTJXzCYanS0Qn/4AM+oQMdBg6ecMer5f+4CRPHDlWswqhmHQlu -bdvWHAgGMyCL6Eh9Co/xN+PlIkcV3nvKP9qfMF4LwQxQ0uh+yijBuggEgZzF+0xB -dtu15yPdHLSuD1EluRUUYms/PtL21zRdte4NwhsRh8ty7x3Vi4kU3GkRGCvjSBjB -uAHnzamQItMz5BJP1uMVw1AcKPp0HWlqNbOUL6SDhLbMYXnsxC1C/UwiNGLNzH8v -NJwj5j0CNi3urCaPdReLa7f0+Df8HeJkujLYthYuXAixL4jK0A7a/LuW/VUkO2cI -qZr/6duOOtjj+7qpIETHn8I3y0LFuuvy/ExmLnddrMwyW0QiqC6FD9l6SG+0DD4U -n8v7ofTrO1u5MuRZL3C4T4HqmunxtjalmaZXCqDSdBJaz1CvTz3EU2vDOfJB3/Lv -GPyEzRI7wv94zAI3nt0hyVnpJEDerbXJ9cJW5z/+gZ4xVBzNVQj7z5j+MKPIMkW2 -mnlYQquN8v7GDnmd04g93dYaSvzZZXw8D3pvQJ27i6mRT6VTH4JreQQgVHTiGcLb -Ljbjn24AH9/SOpEWOde7df2sY5hypmhewLQkz37WVZOzETWeIJIEPcUySR/xhJRD -83fhZUQeHCyyeMs8/1bymxRO0KDvj+9KJH0TPpmtybEQJ2BvgjJANC0lAgEObLu4 -ZHPbY1QS4nV7HpmQvACWexw6h4pBdlpdJ1uufa0+HR5b66g/hmBLGyAbDuZEMmnh -d36xOXB0piSWJjhpHB1agyH0yzuzupcEUKqFADSyqexsxDgJ+h+DjeQTe1b1LvAC -HV2HzA9L5hgDTdWXKhpQr1qlLKKx4Ganb3DGJEN9hai6FnEhDU4ZkYp+GyVV2c+t -f7ZZnmY+1x7qOfBN6sOl3mtpVHLVmJDPrlF9h0YdCyE5U1HvS5wZMu9f2C9uPclp -0EireGrTUGJcPsNMRjLHM5ItbZkNy0DgoCgjKo/oTB6i2icAEooafe/F3DMpXprx -YhUmk6qk4MR9VpMFwVr2I83BFgD3fcHsDsPhuhVXiTaAPhsqmL6vqMltQ2shcW3b -n5US0lM/KnlyDqpmflL1Cil41zXAyQfsX+3jIbrPJqYFqqqUUwmdpcnucWI9CL/8 -YbwDoVlPwpB5cPfn8W740L0DF/J6TQMrmKSxKqarDAlCBuqB7ahCWccftyteb16B -9Z7V7Jmj+D1vdbGhCC+2PvaW670R5MdWHWGXAuAZwDUGSvO4I8/FcHWTTRr1W41e -bsTbOvw26waay+evPImZqHIMnpySkX4N6IKcXRB180OXgurPl4ZFS8cQQmG+Acuq -j+y3r7V1pn7wahUz8gftQENhEHp9EC3u99OC/cVBdKlSYqqZ91LPzYQsskk5Ygcs -KC5BRAgaqc101vAQShXCCQ/ftRKrs7LJCM0l4IJWSWYLIg1PGy2Vm0/7BS60jpU+ -gFk9M49glFG5AvqkmnsYTAr3QYN+KjBsCCNQ2lrV+S7IBlfJ5ThgtfaTMcN7ZECm -mdFZPqju2x2ibu/8NEM+Cw9aTHiIZtRwAzn+Emb5mTeohAEN7gLKbsF4DeNJQoPn -AFJ2MNl1KYdEI8HLpvXhiX2SH8jep4duGdVQzOSbJmxu0G+3PAP4pHdp+YduFnXX -ixseqk8UE0ErCllhXZrWsL/b8OEXQgTdChFiS65Dks5L0x7pgq5MedAiykpbykC5 -yV1/k7AQ8SEXX0692OWPhg/WWlWoDkLNnMFredgnJ53KviPUmxEsv0aRtjnd/DEA -cwZYo+yRvQcBVHND4dsRz84cnKEbhfh0IuVLL05oz6L492i8vBhzKAqKdx109tt1 -mzNOrMiKC0sUYXlIGLYto9uKFPaMFNAB8XIdJK9JU/toIhLoRkNvu0yjE0Tp123B -DtOv/JjCpNn5FKnb/l8ID/GlFNU0T33Zgz71hcZVmOj9m7+N+wX6AVKN5AL3NBm6 -NCV7p/N8FhMSpC620wAd3DupMcH4JGBD+mE1z8Yd36qVFhIhPv00gnhq48D+n/Jv -Rm3AOulV1eQ8pzOfXrkmDYIwLE49yNGH+w== +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 diff --git a/secrets/misc/searx.env b/secrets/misc/searx.env new file mode 100644 index 0000000..4a797a8 --- /dev/null +++ b/secrets/misc/searx.env @@ -0,0 +1,5 @@ +U2FsdGVkX192uHc0MaaDnqI7xQ6OQ8tjboaa6pV7zshGtzQJY1dc+Oc8WRC9eGJ6 +mPpWrpfOnFmUsUI8+lVuN3NTqhmOm8LrVFQUXacwLuGYgaMCzlt4QjOKoaD3lNU5 +/E5zE5neXeVjbqr+k1+L/FE3Y0/YkXnT8FYxFNnbAHPmjmKn+P11OdHX8l7aHlpD +QEvvHyiwtz7pOCscI/1OcC2BDF0wZhMLDAWPR4LBezZzYmt1LK1GDqhmbI5Ws6fG +VPshGQW9kBYxU0bFjaOOq0nuI27Ht1dZormO0s+JtZeyJpkkctHJVbNVZks=