greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Login from Windows finally!

Browse Source
This commit is contained in:
Greg Hellings
2023-12-19 13:45:06 -06:00
parent 195f2f9045
commit fb79feb58d
4 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hosts/myself/container-git.nix
+7 -1
View File
@@ -26,7 +26,13 @@
useHostResolvConf = lib.mkForce false; useHostResolvConf = lib.mkForce false;
}; };
greg.proxies."192.168.200.2".target = "http://unix:/run/gitlab/gitlab-workhorse.socket"; greg.proxies."192.168.200.2" = {
target = "http://unix:/run/gitlab/gitlab-workhorse.socket";
extraConfig = ''
proxy_set_header X-Forwarded-Proto https;
proxy_set_header X-Forwarded-Ssl on;
'';
};
services = { services = {
resolved.enable = true; resolved.enable = true;
hosts/myself/container-runner-vbox.nix
+3
View File
@@ -26,11 +26,14 @@ lib.attrsets.recursiveUpdate {
curl curl
gawk gawk
git git
p7zip
packer packer
pup pup
py py
shellcheck shellcheck
unzip
xorriso xorriso
wget
]; ];
networking = { networking = {
hosts/myself/git.nix
+42 -37
View File
@@ -23,7 +23,13 @@ in {
}; };
}; };
greg.proxies."git.thehellings.lan".target = "http://192.168.200.2"; greg.proxies."git.thehellings.lan" = {
target = "http://192.168.200.2";
extraConfig = ''
proxy_set_header X-Forwarded-Proto https;
proxy_set_header X-Forwarded-Ssl on;
'';
};
system.activationScripts.makeGitlabDir = lib.stringAfter [ "var" ] "mkdir -p ${gitlabStateDir} && touch ${gitlabStateDir}/touch"; system.activationScripts.makeGitlabDir = lib.stringAfter [ "var" ] "mkdir -p ${gitlabStateDir} && touch ${gitlabStateDir}/touch";
@@ -44,17 +50,32 @@ in {
config = ((import ./container-git.nix) { inherit inputs registryPort; }); config = ((import ./container-git.nix) { inherit inputs registryPort; });
}; };
systemd.services."container@gitlab-runner-qemu".serviceConfig = { systemd.services = {
DevicePolicy = lib.mkForce "auto"; "container@gitlab-runner-qemu" = {
ExecPostStop = [ conflicts = [
"rmmod kvm_amd kvm" "container@gitlab-runner-vbox.service"
]; ];
ExecPreStart = [ serviceConfig = {
"modprobe kvm" DevicePolicy = lib.mkForce "auto";
]; ExecPostStop = [ "rmmod kvm_amd kvm" ];
ExecPreStart = [ "modprobe kvm" ];
};
};
"container@gitlab-runner-vbox" = {
conflicts = [
"container@gitlab-runner-qemu.service"
];
serviceConfig = {
DevicePolicy = lib.mkForce "auto";
ExecPostStop = [ "rmmod vboxnetadp vboxnetflt vboxdrv" ];
ExecPreStart = [ "modprobe vboxdrv vboxnetadp vboxnetflt" ];
};
};
}; };
systemd.services."container@gitlab-runner-qemu".conflicts = [ "container@gitlab-runner-vbox.service" ];
#####################################################################################
#################### QEmu Runner ####################################################
#####################################################################################
containers.gitlab-runner-qemu = container { containers.gitlab-runner-qemu = container {
bindMounts = { bindMounts = {
"/dev/kvm" = { "/dev/kvm" = {
@@ -70,22 +91,6 @@ in {
config = ((import ./container-runner-qemu.nix) inputs); config = ((import ./container-runner-qemu.nix) inputs);
}; };
systemd.services."container@gitlab-runner-vbox".serviceConfig = {
DevicePolicy = lib.mkForce "auto";
ExecPostStop = [
"rmmod vboxnetadp vboxnetflt vboxdrv"
];
ExecPreStart = [
"modprobe vboxdrv vboxnetadp vboxnetflt"
];
};
systemd.services."container@gitlab-runner-vbox".conflicts = [ "container@gitlab-runner-qemu.service" ];
systemd.services.gitlab-runner = {
wants = [ "network-online.target" ];
after = [ "network.target" "network-online.target" ];
};
##################################################################################### #####################################################################################
#################### Virtualbox Runner ############################################## #################### Virtualbox Runner ##############################################
##################################################################################### #####################################################################################
@@ -142,19 +147,19 @@ in {
##################################################################################### #####################################################################################
age.secrets.runner-reg.file = ../../secrets/gitlab/myself-podman-runner-reg.age; age.secrets.runner-reg.file = ../../secrets/gitlab/myself-podman-runner-reg.age;
services.gitlab-runner = { services.gitlab-runner = {
enable = true; enable = false;
settings.concurrent = 5; settings.concurrent = 5;
services.podman = { services = {
executor = "docker"; default = {
registrationConfigFile = config.age.secrets.runner-reg.path; executor = "docker";
tagList = [ "container" ]; registrationConfigFile = config.age.secrets.runner-reg.path;
dockerImage = "ubuntu:22.04"; dockerImage = "debian:stable";
};
}; };
}; };
virtualisation.podman = { virtualisation = {
enable = true; docker.enable = true;
dockerCompat = true; oci-containers.backend = "docker";
dockerSocket.enable = true;
}; };
virtualisation.docker.enable = false; #users.users.gitlab-runner.extraGroups = [ "docker" ];
} }
secrets/secrets.nix
+1
View File
@@ -53,4 +53,5 @@ in
"gitlab/myself-vbox-runner-reg.age".publicKeys = everyone; "gitlab/myself-vbox-runner-reg.age".publicKeys = everyone;
"gitlab/myself-podman-runner-reg.age".publicKeys = everyone; "gitlab/myself-podman-runner-reg.age".publicKeys = everyone;
"gitlab/myself-shell-runner-reg.age".publicKeys = everyone; "gitlab/myself-shell-runner-reg.age".publicKeys = everyone;
"gitlab/myself-vmware-runner-reg.age".publicKeys = everyone;
} }