data.coop/ansible
8
3
Fork 7
Code Issues 49 Pull requests 9 Projects 1 Releases Wiki Activity

Move static files into files/ and Jinja2 templates into templates/ #169

Merged
samsapti merged 7 commits from move_stuff_around into main 2023-09-29 21:09:08 +00:00
Conversation 3 Commits 7 Files changed 29 +5 -35
10 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7d13fc5302 - Show all commits

0
roles/docker/files/vhost/_root → roles/docker/files/vhost/base_domain
View file

0
roles/docker/files/vhost/docker → roles/docker/files/vhost/docker_registry
View file

0
roles/docker/files/vhost/social → roles/docker/files/vhost/mastodon
View file

0
roles/docker/files/vhost/cloud → roles/docker/files/vhost/nextcloud
View file

0
roles/docker/files/vhost/www → roles/docker/files/vhost/www.base_domain
View file

30
roles/docker/st
View file

@ -1,30 +0,0 @@
files/
├── byro/
│ └── deploy_entrypoint.sh
├── element/
│ └── riot.im.conf
├── mastodon/
│ └── postgresql.conf
├── matrix/
│ └── log.config
├── privatebin/
│ └── conf.php
├── sso/
│ └── sso.data.coop.pem
└── vhost/
├── _root
├── cloud
├── docker
├── element
├── matrix
├── social
└── www
templates/
├── byro.env.j2
├── element.config.json.j2
├── mailu.env.j2
├── mastodon.env.j2
├── matrix.homeserver.yaml.j2
├── rallly.env.j2
├── restic.ssh.config.j2
└── restic.ssh.known_hosts.j2

2
roles/docker/tasks/services/docker_registry.yml
View file

@ -2,7 +2,7 @@
--- ---
- name: copy docker registry vhost configuration - name: copy docker registry vhost configuration
copy: copy:
src: vhost/docker src: vhost/docker_registry
samsapti marked this conversation as resolved Outdated
valberg commented 2023-07-09 18:42:19 +00:00
Outdated
Review
Copy link

can we call this file docker_registry?

can we call this file docker_registry?
samsapti commented 2023-07-09 18:45:15 +00:00
Outdated
Review
Copy link

My (undocumented) naming convention here is actually the subdomain the service is hosted on, so the docker registry's domain is docker.data.coop and the vhost file is docker (without .data.coop). But if you insist I can change it.

My (undocumented) naming convention here is actually the subdomain the service is hosted on, so the docker registry's domain is `docker.data.coop` and the vhost file is `docker` (without `.data.coop`). But if you insist I can change it.
valberg commented 2023-07-09 18:47:43 +00:00
Outdated
Review
Copy link

can we have the full domain name as the name of the file then? the same with the other comments

can we have the full domain name as the name of the file then? the same with the other comments
samsapti commented 2023-07-09 18:49:23 +00:00
Outdated
Review
Copy link

Then I would rather use the service name instead, just for the sake of avoiding code duplication (not hardcoding the base domain). What do you think?

Then I would rather use the service name instead, just for the sake of avoiding code duplication (not hardcoding the base domain). What do you think?
valberg commented 2023-07-09 19:03:59 +00:00
Outdated
Review
Copy link

ah yes very good point! let's use the name of the service and not anything related to the domain name

ah yes very good point! let's use the name of the service and not anything related to the domain name
👍 1
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.docker_registry.domain }}" dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.docker_registry.domain }}"
mode: "0644" mode: "0644"

2
roles/docker/tasks/services/mastodon.yml
View file

@ -21,7 +21,7 @@
- name: Upload vhost config for root domain - name: Upload vhost config for root domain
copy: copy:
src: vhost/social src: vhost/mastodon
valberg marked this conversation as resolved Outdated
valberg commented 2023-07-09 18:45:37 +00:00
Outdated
Review
Copy link

can we call this file mastodon ?

can we call this file mastodon ?
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.mastodon.domain }}" dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.mastodon.domain }}"
- name: Copy PostgreSQL config - name: Copy PostgreSQL config

2
roles/docker/tasks/services/nextcloud.yml
View file

@ -2,7 +2,7 @@
--- ---
- name: upload vhost config for cloud.data.coop - name: upload vhost config for cloud.data.coop
copy: copy:
src: vhost/cloud src: vhost/nextcloud
valberg marked this conversation as resolved Outdated
valberg commented 2023-07-09 18:45:02 +00:00
Outdated
Review
Copy link

can we call this file nextcloud ?

can we call this file nextcloud ?
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.nextcloud.domain }}" dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.nextcloud.domain }}"
notify: "restart nginx" notify: "restart nginx"

4
roles/docker/tasks/services/websites/data.coop.yml
View file

@ -2,12 +2,12 @@
--- ---
- name: Upload vhost config for root domain - name: Upload vhost config for root domain
copy: copy:
src: vhost/_root src: vhost/base_domain
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ base_domain }}" dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ base_domain }}"
- name: Upload vhost config for WWW domain - name: Upload vhost config for WWW domain
copy: copy:
src: vhost/www src: vhost/www.base_domain
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/www.{{ base_domain }}" dest: "{{ services.nginx_proxy.volume_folder }}/vhost/www.{{ base_domain }}"
- name: setup data.coop website docker container - name: setup data.coop website docker container