mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 07:32:58 +00:00
Merge pull request #282936 from raphaelr/update/hiawatha
hiawatha: 10.11 -> 11.5
This commit is contained in:
commit
1ed7eb0f9a
@ -1,9 +1,10 @@
|
||||
{ lib, stdenv
|
||||
, fetchFromGitLab
|
||||
, callPackage
|
||||
|
||||
, cmake
|
||||
, ninja
|
||||
, mbedtls_2
|
||||
, mbedtls
|
||||
, libxcrypt
|
||||
|
||||
, enableCache ? true # Internal cache support.
|
||||
@ -16,19 +17,19 @@
|
||||
, enableToolkit ? true # The URL Toolkit.
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "hiawatha";
|
||||
version = "10.11";
|
||||
version = "11.5";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "hsleisink";
|
||||
repo = "hiawatha";
|
||||
rev = "v${version}";
|
||||
sha256 = "10a7dqj37zrbmgnhwsw0mqm5x25kasl8p95g01rzakviwxkdrkid";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-kswVBVL/QUQmCwH74qWwSwLz4uwDymuHIr8NokrrgEM=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ninja ];
|
||||
buildInputs = [ mbedtls_2 libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
|
||||
buildInputs = [ mbedtls libxcrypt ] ++ lib.optionals enableXslt [ libxslt libxml2 ];
|
||||
|
||||
prePatch = ''
|
||||
substituteInPlace CMakeLists.txt --replace SETUID ""
|
||||
@ -46,12 +47,18 @@ stdenv.mkDerivation rec {
|
||||
( if enableToolkit then "-DENABLE_TOOLKIT=on" else "-DENABLE_TOOLKIT=off" )
|
||||
];
|
||||
|
||||
passthru.tests.serve-static-files = callPackage ./test.nix {
|
||||
hiawatha = finalAttrs.finalPackage;
|
||||
inherit enableTls;
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://www.hiawatha-webserver.org";
|
||||
homepage = "https://hiawatha.leisink.net/";
|
||||
description = "Advanced and secure webserver";
|
||||
license = licenses.gpl2Only;
|
||||
platforms = platforms.unix; # "Hiawatha runs perfectly on Linux, BSD and MacOS X"
|
||||
mainProgram = "hiawatha";
|
||||
maintainers = [];
|
||||
};
|
||||
|
||||
}
|
||||
})
|
||||
|
84
pkgs/servers/http/hiawatha/test.nix
Normal file
84
pkgs/servers/http/hiawatha/test.nix
Normal file
@ -0,0 +1,84 @@
|
||||
{ lib
|
||||
, stdenvNoCC
|
||||
, hiawatha
|
||||
, curl
|
||||
, mbedtls
|
||||
, enableTls
|
||||
}:
|
||||
|
||||
stdenvNoCC.mkDerivation {
|
||||
name = "hiawatha-test";
|
||||
|
||||
nativeBuildInputs = [
|
||||
hiawatha
|
||||
curl
|
||||
] ++ lib.optional enableTls mbedtls;
|
||||
|
||||
env = {
|
||||
inherit enableTls;
|
||||
};
|
||||
|
||||
buildCommand = ''
|
||||
cp -r --no-preserve=mode ${hiawatha}/etc/hiawatha config
|
||||
sed "1i set TEST_DIR = $(pwd)" $serverConfigPath > config/hiawatha.conf
|
||||
|
||||
mkdir www
|
||||
echo "it works" > www/index.html
|
||||
|
||||
if [ -n "$enableTls" ]; then
|
||||
echo "Generating self-signed certificate"
|
||||
gen_key type=ec filename=server.key
|
||||
cert_write selfsign=1 issuer_key=server.key output_file=server.crt
|
||||
cat server.crt server.key > config/server.crt
|
||||
fi
|
||||
|
||||
echo "Checking server configuration"
|
||||
hiawatha -c ./config -k
|
||||
|
||||
echo "Starting server"
|
||||
hiawatha -c ./config
|
||||
|
||||
testUrl() {
|
||||
echo "Testing $1"
|
||||
curl --verbose --insecure --fail "$1" | tee response
|
||||
grep -q "it works" response
|
||||
}
|
||||
|
||||
testUrl http://127.0.0.1:8000
|
||||
if [ -n "$enableTls" ]; then
|
||||
testUrl https://127.0.0.1:8443
|
||||
fi
|
||||
|
||||
touch $out
|
||||
'';
|
||||
|
||||
serverConfig = ''
|
||||
# By default the server uses read-only directories like /var/lib and /etc
|
||||
WorkDirectory = TEST_DIR
|
||||
PIDfile = TEST_DIR/hiawatha.pid
|
||||
SystemLogfile = TEST_DIR/system.log
|
||||
GarbageLogfile = TEST_DIR/garbage.log
|
||||
ExploitLogfile = TEST_DIR/exploit.log
|
||||
AccessLogfile = TEST_DIR/access.log
|
||||
ErrorLogfile = TEST_DIR/error.log
|
||||
|
||||
Binding {
|
||||
Interface = 127.0.0.1
|
||||
Port = 8000
|
||||
}
|
||||
|
||||
${lib.optionalString enableTls ''
|
||||
Binding {
|
||||
Interface = 127.0.0.1
|
||||
Port = 8443
|
||||
TLScertFile = TEST_DIR/config/server.crt
|
||||
}
|
||||
''}
|
||||
|
||||
Hostname = 127.0.0.1
|
||||
WebsiteRoot = TEST_DIR/www
|
||||
StartFile = index.html
|
||||
'';
|
||||
|
||||
passAsFile = [ "serverConfig" ];
|
||||
}
|
Loading…
Reference in New Issue
Block a user