Merge remote-tracking branch 'prism/lassulus'
This commit is contained in:
commit
d4f36e8ff5
@ -44,7 +44,7 @@ let
|
|||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
|
||||||
path = with pkgs; [
|
path = with pkgs; [
|
||||||
go
|
go-shortener
|
||||||
];
|
];
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
@ -57,7 +57,7 @@ let
|
|||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
User = "go";
|
User = "go";
|
||||||
Restart = "always";
|
Restart = "always";
|
||||||
ExecStart = "${pkgs.go}/bin/go";
|
ExecStart = "${pkgs.go-shortener}/bin/go";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -19,7 +19,7 @@ let
|
|||||||
};
|
};
|
||||||
|
|
||||||
in np.buildNodePackage {
|
in np.buildNodePackage {
|
||||||
name = "go";
|
name = "go-shortener";
|
||||||
|
|
||||||
src = fetchgit {
|
src = fetchgit {
|
||||||
url = "http://cgit.lassul.us/go/";
|
url = "http://cgit.lassul.us/go/";
|
@ -54,7 +54,7 @@ with import <stockholm/lib>;
|
|||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.postgresql;
|
package = pkgs.postgresql;
|
||||||
};
|
};
|
||||||
#virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
#users.users.mainUser.extraGroups = [ "docker" ];
|
#users.users.mainUser.extraGroups = [ "docker" ];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
with import <stockholm/lib>;
|
with import <stockholm/lib>;
|
||||||
{
|
{
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.go
|
pkgs.go-shortener
|
||||||
];
|
];
|
||||||
krebs.go = {
|
krebs.go = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
Loading…
Reference in New Issue
Block a user