diff options
| author | Jan Tuomi <jan@jantuomi.fi> | 2026-07-27 13:54:09 +0300 |
|---|---|---|
| committer | Jan Tuomi <jan@jantuomi.fi> | 2026-07-27 13:54:09 +0300 |
| commit | 73202ab15e3ff44678cbb646b69d647441303c55 (patch) | |
| tree | 6526000bf32192350d2d9c8284cf5db5b020955b /roles/jails | |
| parent | b1e6c3bff6c3d71a95b2261a077b22f90b166799 (diff) | |
Restructure after 15.1 update
Diffstat (limited to 'roles/jails')
| -rw-r--r-- | roles/jails/01_ingress/defaults/main.yml | 5 | ||||
| -rw-r--r-- | roles/jails/01_ingress/handlers/main.yml | 4 | ||||
| -rw-r--r-- | roles/jails/01_ingress/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/jails/21_poudriere_repo/defaults/main.yml | 2 |
4 files changed, 15 insertions, 5 deletions
diff --git a/roles/jails/01_ingress/defaults/main.yml b/roles/jails/01_ingress/defaults/main.yml index e507905..1527cd9 100644 --- a/roles/jails/01_ingress/defaults/main.yml +++ b/roles/jails/01_ingress/defaults/main.yml @@ -1,4 +1,4 @@ -userland: "15.0-RELEASE" +userland: "15.1-RELEASE" devfs_ruleset: 6 no_default_route: true @@ -21,7 +21,6 @@ ingress_routes: - { host: immich.jan.systems, jail: immich, presets: [large_body_size] } - { host: plex.jan.systems, jail: plex, port: 32400, presets: [streaming] } - { host: komga.jan.systems, jail: komga } - - { host: goaccess.jan.systems, jail: goaccess } - { host: poudriere.jan.systems, jail: poudriere_repo } cert_domains: @@ -49,8 +48,6 @@ pkg: files: - src: etc_pf.conf.j2 dest: /etc/pf.conf - - src: usr_local_etc_nginx_nginx.conf.j2 - dest: /usr/local/etc/nginx/nginx.conf - src: acme-dns-auth.py dest: /usr/local/bin/acme-dns-auth.py mode: "0755" diff --git a/roles/jails/01_ingress/handlers/main.yml b/roles/jails/01_ingress/handlers/main.yml new file mode 100644 index 0000000..1819a68 --- /dev/null +++ b/roles/jails/01_ingress/handlers/main.yml @@ -0,0 +1,4 @@ +- name: Reload nginx + service: + name: nginx + state: reloaded diff --git a/roles/jails/01_ingress/tasks/main.yml b/roles/jails/01_ingress/tasks/main.yml index 15992bd..a6fdc3c 100644 --- a/roles/jails/01_ingress/tasks/main.yml +++ b/roles/jails/01_ingress/tasks/main.yml @@ -38,6 +38,15 @@ name: jail tasks_from: jail_setup +- name: Deploy nginx config + template: + src: "{{ jail_role_dir }}/templates/usr_local_etc_nginx_nginx.conf.j2" + dest: /usr/local/etc/nginx/nginx.conf + owner: root + group: wheel + mode: "0644" + notify: Reload nginx + - name: Check if TLS certs exist stat: path: "/usr/local/etc/letsencrypt/live/{{ cert_name }}" diff --git a/roles/jails/21_poudriere_repo/defaults/main.yml b/roles/jails/21_poudriere_repo/defaults/main.yml index 108c494..6b774d4 100644 --- a/roles/jails/21_poudriere_repo/defaults/main.yml +++ b/roles/jails/21_poudriere_repo/defaults/main.yml @@ -1,4 +1,4 @@ -userland: "15.0-RELEASE" +userland: "15.1-RELEASE" nullfs: - src: /usr/local/share/poudriere/html |