Skip to content

Commit

Permalink
Update ansible artefacts
Browse files Browse the repository at this point in the history
  • Loading branch information
Harry Kodden committed Jul 17, 2024
1 parent 56c7a5d commit ea2fa8a
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 22 deletions.
5 changes: 2 additions & 3 deletions ansible/roles/rclone/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,12 @@
dest: "{{ rclone_directory }}/index.php"

- name: Stop rclone
docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ rclone_directory }}"
state: absent
remove_volumes: yes

- name: Start rclone
docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ rclone_directory }}"
state: present
build: yes
3 changes: 1 addition & 2 deletions ansible/roles/rclone/templates/docker-compose.yml.j2
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# {{ ansible_managed }}
version: '3'

services:

rclone:
Expand Down Expand Up @@ -54,6 +52,7 @@ services:
auth_request /oidc/validate;

auth_request_set \$$entitlements \$$upstream_http_x_vouch_idp_claims_eduperson_entitlement;
auth_request_set \$$uid \$$upstream_http_x_vouch_idp_claims_uid;

access_by_lua_block {
entitlements = ngx.var.entitlements;
Expand Down
5 changes: 2 additions & 3 deletions ansible/roles/traefik/tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,12 @@
htpasswd:
path: "{{ traefik_directory }}/htpasswd"
name: admin
password: "{{PROXY_ADMIN_PASSWORD }}"
password: "{{ PROXY_ADMIN_PASSWORD }}"
owner: root
group: root
mode: 0640

- name: Start traefik
docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ traefik_directory }}"
state: present
build: yes
8 changes: 4 additions & 4 deletions ansible/roles/traefik/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
- include: install.yml
- include_tasks: install.yml

- include: configure.yml
- include_tasks: configure.yml

- name: inspect traefik
docker_container_info:
Expand All @@ -15,12 +15,12 @@
traefik_ip_address: "{{ traefik_container_details | json_query(jmesquery) }}"
vars:
jmesquery: "container.NetworkSettings.Networks.{{ traefik_docker_external_network }}.IPAddress"

- name: inspect oidc client
docker_container_info:
name: oidc
register: oidc_container_details

- name: get oidc IP address
set_fact:
oidc_ip_address: "{{ oidc_container_details | json_query(jmesquery) }}"
Expand Down
2 changes: 0 additions & 2 deletions ansible/roles/traefik/templates/docker-compose.yml.j2
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# {{ ansible_managed }}
version: '3'

services:

traefik:
Expand Down
12 changes: 6 additions & 6 deletions ansible/roles/vault/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
- include: install.yml
- include_tasks: install.yml

- include: configure.yml
- include_tasks: configure.yml

- name: Stop vault
docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ vault_directory }}"
stopped: yes
state: stopped
register: output

- name: Delete vault file...
Expand All @@ -16,9 +16,9 @@
when: vault_clean_data

- name: start vault
docker_compose:
community.docker.docker_compose_v2:
project_src: "{{ vault_directory }}"
restarted: yes
state: present
register: output

- name: Pause for 1 minute to wait for vault to be operational
Expand Down
2 changes: 0 additions & 2 deletions ansible/roles/vault/templates/docker-compose.yml.j2
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# {{ ansible_managed }}
version: '3'

services:

vault:
Expand Down

0 comments on commit ea2fa8a

Please sign in to comment.