From 5ec2bd0c35ee3b20b711dfef709c5236b49e845b Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 11 Feb 2025 23:10:57 -0500 Subject: [PATCH] feat: moved to git subdomain --- gitea/Dockerfile | 6 +----- gitea/Dockerfile.dev | 2 +- gitea/config/app.ini | 34 +++++++++++++++++----------------- terraform/routing.tf | 2 +- 4 files changed, 20 insertions(+), 24 deletions(-) diff --git a/gitea/Dockerfile b/gitea/Dockerfile index df36c6e..8682c7c 100644 --- a/gitea/Dockerfile +++ b/gitea/Dockerfile @@ -2,8 +2,4 @@ FROM gitea/gitea:latest-rootless ADD --chown=git:git config /etc/gitea ADD --chown=git:git custom /etc/gitea-custom -ENV GITEA_CUSTOM /etc/gitea-custom - -WORKDIR /etc/gitea-custom - -RUN gitea cert --host code.maximhutz.com --ca \ No newline at end of file +ENV GITEA_CUSTOM=/etc/gitea-custom diff --git a/gitea/Dockerfile.dev b/gitea/Dockerfile.dev index 33d07bc..68851aa 100644 --- a/gitea/Dockerfile.dev +++ b/gitea/Dockerfile.dev @@ -2,7 +2,7 @@ FROM gitea/gitea:latest-rootless ADD --chown=git:git config /etc/gitea ADD --chown=git:git custom /etc/gitea-custom -ENV GITEA_CUSTOM /etc/gitea-custom +ENV GITEA_CUSTOM=/etc/gitea-custom RUN rm /etc/gitea/app.ini RUN mv /etc/gitea/dev.app.ini /etc/gitea/app.ini diff --git a/gitea/config/app.ini b/gitea/config/app.ini index 408b747..38e2683 100644 --- a/gitea/config/app.ini +++ b/gitea/config/app.ini @@ -24,31 +24,31 @@ DISABLE_SSH = false START_SSH_SERVER = true SSH_PORT = 22 SSH_LISTEN_PORT = 22 -SSH_DOMAIN = code.maximhutz.com +SSH_DOMAIN = git.maximhutz.com BUILTIN_SSH_SERVER_USER = git ; --- Signed SSL --- -; PROTOCOL=https -; ENABLE_ACME=true -; ACME_ACCEPTTOS=true -; ACME_DIRECTORY=https -; ACME_EMAIL=proxy@maximhutz.com -; DOMAIN = code.maximhutz.com -; ROOT_URL = https://code.maximhutz.com/ -; HTTP_PORT = 443 +PROTOCOL=https +ENABLE_ACME=true +ACME_ACCEPTTOS=true +ACME_DIRECTORY=https +ACME_EMAIL=proxy@maximhutz.com +DOMAIN = git.maximhutz.com +ROOT_URL = https://git.maximhutz.com/ +HTTP_PORT = 443 ; --- No SSL --- -; DOMAIN = code.maximhutz.com -; ROOT_URL = http://code.maximhutz.com/ +; DOMAIN = git.maximhutz.com +; ROOT_URL = http://git.maximhutz.com/ ; HTTP_PORT = 80 ; --- Self-Signed SSL --- -PROTOCOL = https -ROOT_URL = https://code.maximhutz.com/ -DOMAIN = code.maximhutz.com -HTTP_PORT = 443 -CERT_FILE = cert.pem -KEY_FILE = key.pem +# PROTOCOL = https +# ROOT_URL = https://git.maximhutz.com/ +# DOMAIN = git.maximhutz.com +# HTTP_PORT = 443 +# CERT_FILE = cert.pem +# KEY_FILE = key.pem [database] DB_TYPE = sqlite3 diff --git a/terraform/routing.tf b/terraform/routing.tf index c5109ee..3a202fe 100644 --- a/terraform/routing.tf +++ b/terraform/routing.tf @@ -6,7 +6,7 @@ data "aws_route53_zone" "main" { # Push all domain traffic through the reverse proxy. resource "aws_route53_record" "domain" { zone_id = data.aws_route53_zone.main.zone_id - name = "code.${data.aws_route53_zone.main.name}" + name = "git.${data.aws_route53_zone.main.name}" type = "A" ttl = "60" records = [aws_eip.public.public_ip]