From 3318874168ae71da78c25de65a437cb246c08d88 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 1 Jan 2022 21:31:01 +0000 Subject: [PATCH] marukuru: remove heptapod{,-runner} --- ops/nixos/marukuru/default.nix | 45 ---------------------------------- 1 file changed, 45 deletions(-) diff --git a/ops/nixos/marukuru/default.nix b/ops/nixos/marukuru/default.nix index a59365c0c3..7896d737c7 100644 --- a/ops/nixos/marukuru/default.nix +++ b/ops/nixos/marukuru/default.nix @@ -115,51 +115,6 @@ in { }; virtualisation.docker.extraOptions = "--experimental --ipv6 --ip6tables --fixed-cidr-v6 2402:28c0:4:104e:d000::/68"; - virtualisation.oci-containers.containers = { - heptapod-runner = { - image = "octobus/heptapod-runner:0.2.0"; - volumes = [ - "/srv/gitlab-runner/config:/etc/gitlab-runner" - "/var/run/docker.sock:/var/run/docker.sock" - ]; - }; - heptapod = let img = depot.nix.docker.heptapod; in { - image = "${img.meta.name}:${img.meta.tag}"; - imageFile = img; - ports = [ - # host:container - "22:22" - "80:80" - "443:443" - ]; - volumes = [ - "/srv/gitlab/config:/etc/gitlab" - "/srv/gitlab/logs:/var/log/gitlab" - "/srv/gitlab/data:/var/opt/gitlab" - ]; - environment = { - GITLAB_OMNIBUS_CONFIG = builtins.replaceStrings ["\n"] [";"] '' - external_url "https://hg.lukegb.com" - letsencrypt['enable'] = true - letsencrypt['contact_emails'] = ['letsencrypt@lukegb.com'] - nginx['redirect_http_to_https'] = true - nginx['listen_addresses'] = ["0.0.0.0", "[::]"] - - gitlab_rails['smtp_enable'] = true - gitlab_rails['smtp_address'] = '103.105.48.15' - gitlab_rails['smtp_port'] = 25 - gitlab_rails['gitlab_email_from'] = 'heptapod@hg.lukegb.com' - gitlab_rails['gitlab_email_reply_to'] = 'noreply@hg.lukegb.com' - - prometheus['enable'] = false - - puma['min_threads'] = 1 - puma['max_threads'] = 1 - puma['worker_processes'] = 0 - ''; - }; - }; - }; # Container networking. networking.nat = {