salt/ansible
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some DB shenanigans, disable GitLab because I really don't want to troubleshoot this bullshit right now

Browse Source
This commit is contained in:
Salt 2022-08-04 18:59:02 -05:00
parent d8ed457d88
commit 57fa326546
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/prod_web.yml
View File

@ -24,7 +24,6 @@
- web/desultd.yml - web/desultd.yml
- web/element-web.yml - web/element-web.yml
- web/gitea.yml - web/gitea.yml
- web/gitlab.yml
- web/netbox.yml - web/netbox.yml
- web/nextcloud.yml - web/nextcloud.yml
- web/srv.yml - web/srv.yml
@ -225,8 +224,6 @@
return 200 '{"m.homeserver":{"base_url":"https://matrix.desu.ltd"}}'; return 200 '{"m.homeserver":{"base_url":"https://matrix.desu.ltd"}}';
- name: git.desu.ltd - name: git.desu.ltd
proxy_pass: http://gitea:3000 proxy_pass: http://gitea:3000
- name: gitlab.desu.ltd
proxy_pass: http://gitlab
- name: matrix.desu.ltd - name: matrix.desu.ltd
proxies: proxies:
- location: "~* ^(\/_matrix|\/_synapse|\/client|\/health)" - location: "~* ^(\/_matrix|\/_synapse|\/client|\/health)"

3
playbooks/tasks/web/gitlab.yml
View File

@ -9,11 +9,14 @@
external_url 'https://gitlab.desu.ltd' external_url 'https://gitlab.desu.ltd'
gitlab_rails['gitlab_shell_ssh_port'] = 2224 gitlab_rails['gitlab_shell_ssh_port'] = 2224
gitlab_rails['db_adapter'] = 'postgresql' gitlab_rails['db_adapter'] = 'postgresql'
gitlab_rails['db_database'] = 'gitlab-desultd'
gitlab_rails['db_encoding'] = 'unicode' gitlab_rails['db_encoding'] = 'unicode'
gitlab_rails['db_host'] = '10.0.0.2' gitlab_rails['db_host'] = '10.0.0.2'
gitlab_rails['db_password'] = '{{ secret_gitlab_db_pass }}' gitlab_rails['db_password'] = '{{ secret_gitlab_db_pass }}'
gitlab_rails['db_username'] = 'gitlab-desultd'
nginx['listen_port'] = 80 nginx['listen_port'] = 80
nginx['listen_https'] = false nginx['listen_https'] = false
postgresql['enable'] = false
ports: ports:
- 2224:22/tcp - 2224:22/tcp
networks: networks: