From 0dd06967cca0a7f828c85d882717ca59192affa6 Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 16 Nov 2020 20:10:31 +0100 Subject: tv configs: add elm-package-proxy --- tv/2configs/elm-packages-proxy.nix | 154 +++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 tv/2configs/elm-packages-proxy.nix diff --git a/tv/2configs/elm-packages-proxy.nix b/tv/2configs/elm-packages-proxy.nix new file mode 100644 index 000000000..17a0d2304 --- /dev/null +++ b/tv/2configs/elm-packages-proxy.nix @@ -0,0 +1,154 @@ +{ config, lib, pkgs, ... }: let + + cfg.nameserver = "1.1.1.1"; + cfg.packageDir = "/var/lib/elm-packages"; + cfg.port = 7782; + +in { + services.nginx.virtualHosts."package.elm-lang.org" = { + addSSL = true; + + # TODO secret files + sslCertificate = "/var/lib/certs/package.elm-lang.org/fullchain.pem"; + sslCertificateKey = "/var/lib/certs/package.elm-lang.org/key.pem"; + + locations."/all-packages/since/".extraConfig = '' + proxy_pass http://127.0.0.1:${toString config.krebs.htgen.elm-packages-proxy.port}; + proxy_pass_header Server; + ''; + + locations."~ ^/packages/(?[A-Za-z0-9-]+)/(?[A-Za-z0-9-]+)/(?(?0|[1-9]\\d*)\\.(?0|[1-9]\\d*)\\.(?0|[1-9]\\d*)(?:-(?(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+(?[0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?)/(?:zipball|elm.json|endpoint.json)\$".extraConfig = '' + set $zipball "${cfg.packageDir}/$author/$pname/$version/zipball"; + proxy_set_header X-Author $author; + proxy_set_header X-Package $pname; + proxy_set_header X-Version $version; + proxy_set_header X-Zipball $zipball; + proxy_pass_header Server; + resolver ${cfg.nameserver}; + + if (-f $zipball) { + set $new_uri http://127.0.0.1:${toString config.krebs.htgen.elm-packages-proxy.port}; + } + if (!-f $zipball) { + set $new_uri https://package.elm-lang.org$request_uri; + } + + proxy_pass $new_uri; + ''; + }; + + krebs.htgen.elm-packages-proxy = { + port = cfg.port; + script = /* sh */ ''(. ${pkgs.writeDash "elm-packages-proxy.sh" '' + PATH=${lib.makeBinPath [ + pkgs.coreutils + pkgs.curl + pkgs.findutils + pkgs.gnugrep + pkgs.jq + pkgs.unzip + ]} + export PATH + file_response() {( + status_code=$1 + status_reason=$2 + file=$3 + content_type=$4 + + content_length=$(wc -c "$file" | cut -d\ -f1) + + printf "HTTP/1.1 $status_code $status_reason\r\n" + printf 'Connection: close\r\n' + printf 'Content-Length: %d\r\n' "$content_length" + printf 'Content-Type: %s\r\n' "$content_type" + printf 'Server: %s\r\n' "$Server" + printf '\r\n' + cat "$file" + )} + string_response() {( + status_code=$1 + status_reason=$2 + response_body=$3 + content_type=$4 + + printf "HTTP/1.1 $status_code $status_reason\r\n" + printf 'Connection: close\r\n' + printf 'Content-Length: %d\r\n' ''${#response_body} + printf 'Content-Type: %s\r\n' "$content_type" + printf 'Server: %s\r\n' "$Server" + printf '\r\n' + printf '%s\n' "$response_body" + )} + + case "$Method $Request_URI" in + 'GET /packages/'*) + + author=$req_x_author + pname=$req_x_package + version=$req_x_version + + zipball=${cfg.packageDir}/$author/$pname/$version/zipball + elmjson=$HOME/cache/$author%2F$pname%2F$version%2Felm.json + endpointjson=$HOME/cache/$author%2F$pname%2F$version%2Fendpoint.json + mkdir -p "$HOME/cache" + + case $(basename $Request_URI) in + zipball) + file_response 200 OK "$zipball" application/zip + exit + ;; + elm.json) + if ! test -f "$elmjson"; then + unzip -p "$zipball" \*/elm.json > "$elmjson" + fi + file_response 200 OK "$elmjson" 'application/json; charset=UTF-8' + exit + ;; + endpoint.json) + if ! test -f "$endpointjson"; then + hash=$(sha1sum "$zipball" | cut -d\ -f1) + url=https://package.elm-lang.org/packages/$author/$pname/$version/zipball + jq -n \ + --arg hash "$hash" \ + --arg url "$url" \ + '{ $hash, $url }' \ + > "$endpointjson" + fi + file_response 200 OK "$endpointjson" 'application/json; charset=UTF-8' + exit + ;; + esac + ;; + 'POST /all-packages/since/'*) + + # TODO only show newest? + my_packages=$( + cd ${cfg.packageDir} + find -mindepth 3 -maxdepth 3 | + jq -Rs ' + split("\n") | + map( + select(.!="") | + sub("^\\./(?[^/]+)/(?[^/]+)/(?[^/]+)$";"\(.author)/\(.pname)@\(.version)") + ) + ' + ) + + new_upstream_packages=$( + curl -fsS https://package.elm-lang.org"$Request_URI" + ) + + response=$( + jq -n \ + --argjson my_packages "$my_packages" \ + --argjson new_upstream_packages "$new_upstream_packages" \ + '$new_upstream_packages + $my_packages' + ) + + string_response 200 OK "$response" 'application/json; charset=UTF-8' + exit + ;; + esac + ''})''; + }; +} -- cgit v1.2.3 From 6c787716577c8a9e6802ab9d6c8dda9695a0d164 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 17 Nov 2020 20:10:34 +0100 Subject: tv configs: enable nscd for 20.09 and newer --- tv/2configs/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 2d813fe32..975266f6f 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -90,7 +90,9 @@ with import ; { services.cron.enable = false; - services.nscd.enable = false; + services.nscd.enable = + # Since 20.09 nscd doesn't cache anymore. + versionOlder version "20.09"; services.ntp.enable = false; services.timesyncd.enable = true; } -- cgit v1.2.3 From 6a793ad5daa5cc602d1948b834b7e50ff52d4845 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 17 Nov 2020 21:09:53 +0100 Subject: much: 1.2.0 -> 1.3.0 --- krebs/5pkgs/haskell/much.nix | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/krebs/5pkgs/haskell/much.nix b/krebs/5pkgs/haskell/much.nix index db168f8a1..0a5453c0c 100644 --- a/krebs/5pkgs/haskell/much.nix +++ b/krebs/5pkgs/haskell/much.nix @@ -1,29 +1,36 @@ { mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-builder, blessings, bytestring, case-insensitive -, containers, deepseq, directory, docopt, email-header, fetchgit -, filepath, friendly-time, hyphenation, linebreak, old-locale -, process, random, rosezipper, safe, scanner, split, stdenv -, terminal-size, text, time, transformers, transformers-compat -, unix, vector +, containers, data-default, deepseq, directory, either +, email-header, fetchgit, filepath, friendly-time, http-types +, hyphenation, linebreak, network, old-locale, optparse-applicative +, process, random, rosezipper, safe, scanner, servant-server, split +, stdenv, terminal-size, text, time, transformers +, transformers-compat, unix, vector, wai, warp }: mkDerivation { pname = "much"; version = "1.2.0"; src = fetchgit { url = "https://cgit.krebsco.de/much"; - sha256 = "0gfvppi8acylz0q7xh8dkm3dj676d4sc1m1gxwp663bkn4748873"; - rev = "8fc4fbb5bb7781626da8f63cd8df8bb0f554cfe7"; + sha256 = "0rf27d7gki5hgivy49xi59ld0j6jw3v7nxi4w1gx6byj1xsarwwl"; + rev = "29749366052a8f6c05b314f1ff17201717855ad7"; fetchSubmodules = true; }; - isLibrary = false; + isLibrary = true; isExecutable = true; - executableHaskellDepends = [ + libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-builder blessings - bytestring case-insensitive containers deepseq directory docopt - email-header filepath friendly-time hyphenation linebreak - old-locale process random rosezipper safe scanner split + bytestring case-insensitive containers data-default deepseq + directory either email-header filepath friendly-time http-types + hyphenation linebreak network old-locale optparse-applicative + process random rosezipper safe scanner servant-server split terminal-size text time transformers transformers-compat unix - vector + vector wai warp + ]; + executableHaskellDepends = [ + aeson base blessings bytestring case-insensitive containers + data-default deepseq directory filepath hyphenation linebreak + process rosezipper safe scanner text time transformers unix ]; license = stdenv.lib.licenses.mit; } -- cgit v1.2.3