rarias/jungle
rarias/jungle
2
0
Fork 1
Code Issues 32 Pull Requests 1 Packages Projects Releases Wiki Activity

Compare commits

base: rarias:master
Branches Tags
rarias:master
rarias:add-fpga-u280
rarias:add-fox-machine
rarias:share-files
rarias:shared-nix-store
rarias:intro-nix
rarias:lake2-ipoib
abonerib:77-hut-cache
abonerib:cache-fixes
abonerib:add-fpga-u280
abonerib:add-fox-machine
abonerib:master
abonerib:share-files
abonerib:shared-nix-store
abonerib:intro-nix
abonerib:lake2-ipoib
..
compare: abonerib:77-hut-cache
Branches Tags
abonerib:77-hut-cache
abonerib:cache-fixes
abonerib:add-fpga-u280
abonerib:add-fox-machine
abonerib:master
abonerib:share-files
abonerib:shared-nix-store
abonerib:intro-nix
abonerib:lake2-ipoib
rarias:master
rarias:add-fpga-u280
rarias:add-fox-machine
rarias:share-files
rarias:shared-nix-store
rarias:intro-nix
rarias:lake2-ipoib

No commits in common. "master" and "77-hut-cache" have entirely different histories.
master ... 77-hut-cac

2 changed files with 6 additions and 8 deletions
Show Stats Expand all files Collapse all files

3
m/common/base/ssh.nix
View File

@ -10,7 +10,7 @@ in
# Connect to intranet git hosts via proxy # Connect to intranet git hosts via proxy
programs.ssh.extraConfig = '' programs.ssh.extraConfig = ''
Host bscpm02.bsc.es bscpm03.bsc.es bscpm04.bsc.es gitlab-internal.bsc.es alya.gitlab.bsc.es Host bscpm02.bsc.es bscpm03.bsc.es gitlab-internal.bsc.es alya.gitlab.bsc.es
User git User git
ProxyCommand nc -X connect -x hut:23080 %h %p ProxyCommand nc -X connect -x hut:23080 %h %p
@ -22,7 +22,6 @@ in
programs.ssh.knownHosts = hostsKeys // { programs.ssh.knownHosts = hostsKeys // {
"gitlab-internal.bsc.es".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF9arsAOSRB06hdy71oTvJHG2Mg8zfebADxpvc37lZo3"; "gitlab-internal.bsc.es".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIF9arsAOSRB06hdy71oTvJHG2Mg8zfebADxpvc37lZo3";
"bscpm03.bsc.es".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2NuSUPsEhqz1j5b4Gqd+MWFnRqyqY57+xMvBUqHYUS"; "bscpm03.bsc.es".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM2NuSUPsEhqz1j5b4Gqd+MWFnRqyqY57+xMvBUqHYUS";
"bscpm04.bsc.es".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPx4mC0etyyjYUT2Ztc/bs4ZXSbVMrogs1ZTP924PDgT";
"glogin1.bsc.es".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsHsZGCrzpd4QDVn5xoDOtrNBkb0ylxKGlyBt6l9qCz"; "glogin1.bsc.es".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsHsZGCrzpd4QDVn5xoDOtrNBkb0ylxKGlyBt6l9qCz";
"glogin2.bsc.es".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsHsZGCrzpd4QDVn5xoDOtrNBkb0ylxKGlyBt6l9qCz"; "glogin2.bsc.es".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFsHsZGCrzpd4QDVn5xoDOtrNBkb0ylxKGlyBt6l9qCz";
}; };

11
m/hut/gitlab-runner.nix
View File

@ -97,13 +97,12 @@
}; };
}; };
# DOCKER* chains are useless, override at FORWARD and nixos-fw # DOCKER* chains are useless, override at FORWARD
networking.firewall.extraCommands = '' networking.firewall.extraCommands = ''
# Don't forward any traffic from docker # Allow docker to use our proxy
iptables -I FORWARD 1 -p all -i docker0 -j nixos-fw-log-refuse iptables -I FORWARD 1 -p tcp -i docker0 -d hut --dport 23080 -j nixos-fw-accept
# Block anything else coming from docker
# Allow incoming traffic from docker to 23080 iptables -I FORWARD 2 -p all -i docker0 -j nixos-fw-log-refuse
iptables -A nixos-fw -p tcp -i docker0 -d hut --dport 23080 -j ACCEPT
''; '';
#systemd.services.gitlab-runner.serviceConfig.Shell = "${pkgs.bash}/bin/bash"; #systemd.services.gitlab-runner.serviceConfig.Shell = "${pkgs.bash}/bin/bash";