virtlyst: init at 1.1.0

Co-authored-by: elseym <elseym@me.com>
This commit is contained in:
Franz Pletz 2018-06-26 01:11:00 +02:00
parent 5d534c2663
commit 1d235be208
No known key found for this signature in database
GPG key ID: 846FDED7792617B4
3 changed files with 48 additions and 0 deletions

View file

@ -0,0 +1,14 @@
diff --git a/src/virtlyst.cpp b/src/virtlyst.cpp
index acd195d..8809e4f 100644
--- a/src/virtlyst.cpp
+++ b/src/virtlyst.cpp
@@ -340,7 +340,8 @@ bool Virtlyst::createDB()
qCCritical(VIRTLYST) << "Error creating database" << query.lastError().text();
return false;
}
- const QString password = QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex());
+ const QString password = qEnvironmentVariable("VIRTLYST_ADMIN_PASSWORD",
+ QString::fromLatin1(QUuid::createUuid().toRfc4122().toHex()));
query.bindValue(QStringLiteral(":password"), QString::fromLatin1(
CredentialPassword::createPassword(password.toUtf8(), QCryptographicHash::Sha256, 10000, 16, 16)));
if (!query.exec()) {

View file

@ -0,0 +1,32 @@
{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, autoPatchelfHook
, qtbase, libvirt, cutelyst, grantlee }:
stdenv.mkDerivation rec {
name = "virtlyst-${version}";
version = "1.1.0";
src = fetchFromGitHub {
owner = "cutelyst";
repo = "Virtlyst";
rev = "v${version}";
sha256 = "1rqv93dys666wsqbg1lvl3pjl8gpdx3dc3y71m3r8apalgr11ikw";
};
nativeBuildInputs = [ cmake pkgconfig autoPatchelfHook ];
buildInputs = [ qtbase libvirt cutelyst grantlee ];
installPhase = ''
mkdir -p $out/lib
cp src/libVirtlyst.so $out/lib
cp -r ../root $out
'';
patches = [ ./add-admin-password-env.patch ];
meta = with lib; {
description = "Web interface to manage virtual machines with libvirt";
homepage = https://github.com/cutelyst/Virtlyst;
license = licenses.agpl3Plus;
maintainers = with maintainers; [ fpletz ];
};
}

View file

@ -13171,6 +13171,8 @@ with pkgs;
unifiTesting;
unifi = unifiStable;
virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { };
virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { };
virtuoso7 = callPackage ../servers/sql/virtuoso/7.x.nix { };