kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-10-31 18:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed multiple roles incl. oauth2 to to web-app-*

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-07-21 11:28:54 +02:00
parent 4717e33649
commit 356c214718
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/all/09_ports.yml
View File

@@ -15,7 +15,7 @@ ports:
web-app-yourls: 4184
web-app-pgadmin: 4185
web-app-phpldapadmin: 4186
fusiondirectory: 4187
web-app-fusiondirectory: 4187
web-app-gitea: 4188
web-app-snipe-it: 4189
ldap:
@@ -59,7 +59,7 @@ ports:
web-app-snipe-it: 8035
web-app-sphinx: 8036
web-app-phpldapadmin: 8037
fusiondirectory: 8038
web-app-fusiondirectory: 8038
web-app-navigator: 8039
web-app-espocrm: 8040
syncope: 8041

2
group_vars/all/10_networks.yml
View File

@@ -76,7 +76,7 @@ defaults_networks:
subnet: 192.168.103.0/28
web-app-phpldapadmin:
subnet: 192.168.103.16/28
fusiondirectory:
web-app-fusiondirectory:
subnet: 192.168.103.32/28
web-app-navigator:
subnet: 192.168.103.48/28

2
roles/web-app-bookwyrm/vars/main.yml
View File

@@ -1 +1 @@
application_id: bookwyrm
application_id: web-app-bookwyrm

2
roles/web-app-fusiondirectory/vars/main.yml
View File

@@ -1 +1 @@
application_id: "fusiondirectory"
application_id: "web-app-fusiondirectory"

2
roles/web-app-oauth2-proxy/tasks/main.yml
View File

@@ -1,6 +1,6 @@
- name: "Transfering oauth2-proxy-keycloak.cfg.j2 to {{( application_id | get_docker_paths(path_docker_compose_instances) ).directories.volumes }}"
template:
src: "{{ playbook_dir }}/roles/web-app-oauth2-proxy/templates/oauth2-proxy-keycloak.cfg.j2"
dest: "{{( application_id | get_docker_paths(path_docker_compose_instances) ).directories.volumes }}{{applications | get_app_conf('oauth2-proxy','configuration_file')}}"
dest: "{{( application_id | get_docker_paths(path_docker_compose_instances) ).directories.volumes }}{{applications | get_app_conf('web-app-oauth2-proxy','configuration_file')}}"
notify:
- docker compose up

4
roles/web-app-oauth2-proxy/templates/container.yml.j2
View File

@@ -1,11 +1,11 @@
{% if applications | get_app_conf(application_id, 'features.oauth2', False) %}
oauth2-proxy:
image: quay.io/oauth2-proxy/oauth2-proxy:{{applications['oauth2-proxy'].version}}
image: quay.io/oauth2-proxy/oauth2-proxy:{{applications['web-app-oauth2-proxy'].version}}
restart: {{docker_restart_policy}}
command: --config /oauth2-proxy.cfg
hostname: oauth2-proxy
ports:
- {{ports.localhost.oauth2_proxy[application_id]}}:4180/tcp
volumes:
- "{{docker_compose.directories.volumes}}{{applications | get_app_conf('oauth2-proxy','configuration_file')}}:/oauth2-proxy.cfg"
- "{{docker_compose.directories.volumes}}{{applications | get_app_conf('web-app-oauth2-proxy','configuration_file')}}:/oauth2-proxy.cfg"
{% endif %}

2
roles/web-app-oauth2-proxy/vars/main.yml
View File

@@ -1 +1 @@
application_id: oauth2-proxy
application_id: web-app-oauth2-proxy

4
tasks/utils/update-repository-with-files.yml
View File

@@ -2,9 +2,9 @@
# Better load the repositories into /opt/docker/[servicename]/services, build them there and then use a docker-compose file for customizing
# @todo Refactor\Remove
# @deprecated
- name: "Merge detached_files with applications | get_app_conf('oauth2-proxy','configuration_file')"
- name: "Merge detached_files with applications | get_app_conf('web-app-oauth2-proxy','configuration_file')"
set_fact:
merged_detached_files: "{{ detached_files + [applications | get_app_conf('oauth2-proxy','configuration_file')] }}"
merged_detached_files: "{{ detached_files + [applications | get_app_conf('web-app-oauth2-proxy','configuration_file')] }}"
when: "{{ applications | get_app_conf(application_id,'features.oauth2')"
- name: "backup detached files"