From 57fa326546bd101c5f853a17c79060ca9981ae98 Mon Sep 17 00:00:00 2001 From: Jacob Babor Date: Thu, 4 Aug 2022 18:59:02 -0500 Subject: [PATCH] Fix some DB shenanigans, disable GitLab because I really don't want to troubleshoot this bullshit right now --- playbooks/prod_web.yml | 3 --- playbooks/tasks/web/gitlab.yml | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/prod_web.yml b/playbooks/prod_web.yml index 9decae6..fe55774 100755 --- a/playbooks/prod_web.yml +++ b/playbooks/prod_web.yml @@ -24,7 +24,6 @@ - web/desultd.yml - web/element-web.yml - web/gitea.yml - - web/gitlab.yml - web/netbox.yml - web/nextcloud.yml - web/srv.yml @@ -225,8 +224,6 @@ return 200 '{"m.homeserver":{"base_url":"https://matrix.desu.ltd"}}'; - name: git.desu.ltd proxy_pass: http://gitea:3000 - - name: gitlab.desu.ltd - proxy_pass: http://gitlab - name: matrix.desu.ltd proxies: - location: "~* ^(\/_matrix|\/_synapse|\/client|\/health)" diff --git a/playbooks/tasks/web/gitlab.yml b/playbooks/tasks/web/gitlab.yml index c60eccf..829e367 100644 --- a/playbooks/tasks/web/gitlab.yml +++ b/playbooks/tasks/web/gitlab.yml @@ -9,11 +9,14 @@ external_url 'https://gitlab.desu.ltd' gitlab_rails['gitlab_shell_ssh_port'] = 2224 gitlab_rails['db_adapter'] = 'postgresql' + gitlab_rails['db_database'] = 'gitlab-desultd' gitlab_rails['db_encoding'] = 'unicode' gitlab_rails['db_host'] = '10.0.0.2' gitlab_rails['db_password'] = '{{ secret_gitlab_db_pass }}' + gitlab_rails['db_username'] = 'gitlab-desultd' nginx['listen_port'] = 80 nginx['listen_https'] = false + postgresql['enable'] = false ports: - 2224:22/tcp networks: