Merge pull request #12601 from tomberek/gateone_update

Gateone: fix cacerts dependency
This commit is contained in:
Arseniy Seroka 2016-01-25 23:14:53 +03:00
commit e395cb0214
2 changed files with 7 additions and 6 deletions

View File

@ -21,7 +21,7 @@ options = {
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.systemPackages = with pkgs.pythonPackages; [ environment.systemPackages = with pkgs.pythonPackages; [
gateone pkgs.openssh pkgs.procps pkgs.coreutils ]; gateone pkgs.openssh pkgs.procps pkgs.coreutils pkgs.cacert];
users.extraUsers.gateone = { users.extraUsers.gateone = {
description = "GateOne privilege separation user"; description = "GateOne privilege separation user";
@ -49,8 +49,6 @@ config = mkIf cfg.enable {
User = "gateone"; User = "gateone";
Group = "gateone"; Group = "gateone";
WorkingDirectory = cfg.settingsDir; WorkingDirectory = cfg.settingsDir;
PermissionsStartOnly = true;
}; };
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];

View File

@ -5130,18 +5130,21 @@ in modules // {
name = "gateone-1.2-0d57c3"; name = "gateone-1.2-0d57c3";
disabled = ! isPy27; disabled = ! isPy27;
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
rev = "11ed97c663b3e8c1b8eba473b5cf8362b10d57c3"; rev = "1d0e8037fbfb7c270f3710ce24154e24b7031bea";
owner= "liftoff"; owner= "liftoff";
repo = "GateOne"; repo = "GateOne";
sha256 ="0zp9vfs6sqbx4d0g45kkjinfmsl9zqwa6bhp3xd81wx3ph9yr1hq"; sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv";
}; };
propagatedBuildInputs = with self; [tornado futures html5lib readline pkgs.openssl]; propagatedBuildInputs = with self; [tornado futures html5lib readline pkgs.openssl pkgs.cacert pkgs.openssh];
meta = { meta = {
homepage = https://liftoffsoftware.com/; homepage = https://liftoffsoftware.com/;
description = "GateOne is a web-based terminal emulator and SSH client"; description = "GateOne is a web-based terminal emulator and SSH client";
maintainers = with maintainers; [ tomberek ]; maintainers = with maintainers; [ tomberek ];
}; };
postInstall=''
cp -R $out/gateone/* $out/lib/python2.7/site-packages/gateone
'';
}; };
gcutil = buildPythonPackage rec { gcutil = buildPythonPackage rec {