diff --git a/clan/flake-module.nix b/clan/flake-module.nix index 2cf52fe..c89421d 100644 --- a/clan/flake-module.nix +++ b/clan/flake-module.nix @@ -146,7 +146,7 @@ domain = "buildbot.turifer.dev"; admins = [ "rpqt" ]; topic = "buildbot-nix"; - gitea.instanceUrl = "https://git.turifer.dev"; + gitea.instanceUrl = "https:/git.rpqt.fr"; }; }; diff --git a/infra/web.nix b/infra/web.nix index bf529d6..71cc87e 100644 --- a/infra/web.nix +++ b/infra/web.nix @@ -37,20 +37,6 @@ records = [ { value = infra.machines.verbena.ipv6; } ]; }; - git_turifer_dev_a = { - zone = config.resource.hcloud_zone.turifer_dev "name"; - name = "git"; - type = "A"; - records = [ { value = infra.machines.verbena.ipv4; } ]; - }; - - git_turifer_dev_aaaa = { - zone = config.resource.hcloud_zone.turifer_dev "name"; - name = "git"; - type = "AAAA"; - records = [ { value = infra.machines.verbena.ipv6; } ]; - }; - git_rpqt_fr_a = { zone = config.resource.hcloud_zone.rpqt_fr "name"; name = "git"; diff --git a/machines/verbena/configuration.nix b/machines/verbena/configuration.nix index c42e87c..e67d693 100644 --- a/machines/verbena/configuration.nix +++ b/machines/verbena/configuration.nix @@ -3,7 +3,6 @@ imports = [ self.nixosModules.nix-defaults self.nixosModules.nextcloud - self.nixosModules.gitea self.nixosModules.forgejo self.inputs.srvos.nixosModules.server diff --git a/nixosModules/gitea.nix b/nixosModules/gitea.nix deleted file mode 100644 index 034801e..0000000 --- a/nixosModules/gitea.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ config, ... }: -{ - services.gitea = { - enable = true; - lfs.enable = true; - - settings = { - # storage = { - # }; - - server = { - ROOT_URL = "https://git.turifer.dev"; - DOMAIN = "git.turifer.dev"; - }; - - session.PROVIDER = "db"; - session.COOKIE_SECURE = true; - - service.DISABLE_REGISTRATION = true; - - # Create a repository by pushing to it - repository.ENABLE_PUSH_CREATE_USER = true; - }; - }; - - systemd.services.gitea.environment = { - GITEA__storage__STORAGE_TYPE = "minio"; - GITEA__storage__MINIO_ENDPOINT = "localhost:3900"; - GITEA__storage__MINIO_BUCKET = "gitea"; - GITEA__storage__MINIO_LOCATION = "garage"; - GITEA__storage__MINIO_USE_SSL = "false"; - }; - - systemd.services.gitea.serviceConfig = { - LoadCredential = [ - "minio_access_key_id:${config.clan.core.vars.generators.gitea-s3-storage.files.access-key-id.path}" - "minio_secret_access_key:${config.clan.core.vars.generators.gitea-s3-storage.files.access-key-secret.path}" - ]; - Environment = [ - "GITEA__storage__MINIO_ACCESS_KEY_ID=%d/minio_access_key_id" - "GITEA__storage__MINIO_SECRET_ACCESS_KEY=%d/minio_secret_access_key" - ]; - }; - - clan.core.vars.generators.gitea-s3-storage = { - prompts.access-key-id = { - description = "s3 access key id"; - type = "line"; - persist = true; - }; - prompts.access-key-secret = { - description = "s3 access key secret"; - type = "hidden"; - persist = true; - }; - }; - - clan.core.state.gitea.folders = [ config.services.gitea.stateDir ]; - - services.nginx.virtualHosts."git.turifer.dev" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://localhost:${builtins.toString (config.services.gitea.settings.server.HTTP_PORT)}"; - }; - }; - - security.acme.certs."git.turifer.dev" = { - email = "admin@turifer.dev"; - }; -}