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
10 changed files with 5 additions and 35 deletions
Showing only changes of commit 7d13fc5302 - Show all commits

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

View file

@ -2,7 +2,7 @@
---
- name: copy docker registry vhost configuration
copy:
src: vhost/docker
src: vhost/docker_registry
samsapti marked this conversation as resolved Outdated

can we call this file docker_registry?

can we call this file docker_registry?

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.

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

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?

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
dest: "{{ services.nginx_proxy.volume_folder }}/vhost/{{ services.docker_registry.domain }}"
mode: "0644"

View file

@ -21,7 +21,7 @@
- name: Upload vhost config for root domain
copy:
src: vhost/social
src: vhost/mastodon
valberg marked this conversation as resolved Outdated

can we call this file mastodon ?

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

View file

@ -2,7 +2,7 @@
---
- name: upload vhost config for cloud.data.coop
copy:
src: vhost/cloud
src: vhost/nextcloud
valberg marked this conversation as resolved Outdated

can we call this file nextcloud ?

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

View file

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