Skip to content

Commit cdee824

Browse files
committed
WIP
1 parent 680be7d commit cdee824

File tree

80 files changed

+566
-575
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+566
-575
lines changed

environments/template/group_vars/all.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ admin_email: "openconext-admin@example.edu"
3030
environment_shortname: ""
3131
environment_ribbon_colour: ""
3232

33+
current_release_appdir: /opt/openconext
34+
3335
httpd_csp:
3436
lenient: "default-src 'self'; object-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; form-action 'self'; frame-ancestors 'none'; base-uri 'none'"
3537
lenient_with_static_img: "default-src 'self'; object-src 'none'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' https://{{ static_vhost }} http://localhost:* data:; form-action 'self'; frame-ancestors 'none'; base-uri 'none'"

roles/mailpit/defaults/main.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
---
2-
mailpit: "{{ mailpit_defaults | combine(mailpit_overrides, recursive=true) }}"
3-
4-
mailpit_defaults:
5-
image: "axllent/mailpit"
6-
hostname: "mailpit.{{ base_domain }}"
7-
user: "mailpit"
8-
group: "mailpit"
2+
mailpit_image: "axllent/mailpit"
3+
mailpit_hostname: "mailpit.{{ base_domain }}"
4+
mailpit_user: "mailpit"
5+
mailpit_group: "mailpit"

roles/mailpit/tasks/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
22
- name: "Create mailpit group"
33
group:
4-
name: "{{ mailpit.group }}"
4+
name: "{{ mailpit_group }}"
55
state: "present"
66
register: "result"
77

88
- name: "Create mailpit user"
99
user:
10-
name: "{{ mailpit.user }}"
11-
group: "{{ mailpit.group }}"
10+
name: "{{ mailpit_user }}"
11+
group: "{{ mailpit_group }}"
1212
comment: "User to run Mailpit service"
1313
shell: "/bin/false"
1414
password: "!"
@@ -23,7 +23,7 @@
2323
- name: "Create mailpit container"
2424
docker_container:
2525
name: "mailpit"
26-
image: "{{ mailpit.image }}"
26+
image: "{{ mailpit_image }}"
2727
restart_policy: "always"
2828
state: "started"
2929
user: "{{ mailpit_user_uid }}"
@@ -32,6 +32,6 @@
3232
- name: "loadbalancer"
3333
labels:
3434
traefik.enable: "true"
35-
traefik.http.routers.mailpit.rule: "Host(`{{ mailpit.hostname }}`)"
35+
traefik.http.routers.mailpit.rule: "Host(`{{ mailpit_hostname }}`)"
3636
traefik.http.routers.mailpit.tls: "true"
3737
traefik.http.services.mailpit.loadbalancer.server.port: 8025

roles/sram-ldap/defaults/main.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

roles/sram-ldap/vars/main.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

roles/sram-metadata/vars/main.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

roles/sram-plsc/defaults/main.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

roles/sram-plsc/templates/plsc.yml.j2

Lines changed: 0 additions & 25 deletions
This file was deleted.

roles/sram-plsc/vars/main.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

roles/sram-redis/defaults/main.yml

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)