janik/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Add hydraProxy module

Browse source
This commit is contained in:
Eelco Dolstra 2019-10-04 21:31:27 +02:00
parent d0b972bdd0
commit 80738fadb1
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
flake.nix
View file

@ -3,7 +3,7 @@
edition = 201909; edition = 201909;
inputs.nixpkgs.uri = "nixpkgs/release-19.09"; inputs.nixpkgs.uri = "nixpkgs/release-19.03";
outputs = { self, nixpkgs, nix }: outputs = { self, nixpkgs, nix }:
let let
@ -295,12 +295,36 @@
# The following is to work around the following error from hydra-server: # The following is to work around the following error from hydra-server:
# [error] Caught exception in engine "Cannot determine local time zone" # [error] Caught exception in engine "Cannot determine local time zone"
time.timeZone = "UTC"; time.timeZone = "UTC";
nix.extraOptions = ''
allowed-uris = https://github.com/
'';
};
nixosModules.hydraProxy = {
services.httpd = {
enable = true;
adminAddr = "hydra-admin@example.org";
extraConfig = ''
<Proxy *>
Order deny,allow
Allow from all
</Proxy>
ProxyRequests Off
ProxyPreserveHost On
ProxyPass /apache-errors !
ErrorDocument 503 /apache-errors/503.html
ProxyPass / http://127.0.0.1:3000/ retry=5 disablereuse=on
ProxyPassReverse / http://127.0.0.1:3000/
'';
};
}; };
nixosConfigurations.container = nixpkgs.lib.nixosSystem { nixosConfigurations.container = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
[ { imports = [ self.nixosModules.hydraTest ]; [ { imports = [ self.nixosModules.hydraTest self.nixosModules.hydraProxy ];
system.configurationRevision = self.rev; system.configurationRevision = self.rev;
boot.isContainer = true; boot.isContainer = true;
@ -308,29 +332,7 @@
networking.firewall.allowedTCPPorts = [ 80 ]; networking.firewall.allowedTCPPorts = [ 80 ];
networking.hostName = "hydra"; networking.hostName = "hydra";
nix.extraOptions = ''
allowed-uris = https://github.com/
'';
services.hydra-dev.useSubstitutes = true; services.hydra-dev.useSubstitutes = true;
services.httpd = {
enable = true;
adminAddr = "hydra-admin@example.org";
extraConfig = ''
<Proxy *>
Order deny,allow
Allow from all
</Proxy>
ProxyRequests Off
ProxyPreserveHost On
ProxyPass /apache-errors !
ErrorDocument 503 /apache-errors/503.html
ProxyPass / http://127.0.0.1:3000/ retry=5 disablereuse=on
ProxyPassReverse / http://127.0.0.1:3000/
'';
};
} }
]; ];
}; };