diff options
Diffstat (limited to 'roles/jails/01_ingress')
| -rw-r--r-- | roles/jails/01_ingress/defaults/main.yml | 9 | ||||
| -rw-r--r-- | roles/jails/01_ingress/tasks/main.yml | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/roles/jails/01_ingress/defaults/main.yml b/roles/jails/01_ingress/defaults/main.yml index 9761d43..e7a2fca 100644 --- a/roles/jails/01_ingress/defaults/main.yml +++ b/roles/jails/01_ingress/defaults/main.yml @@ -2,6 +2,10 @@ userland: "15.0-RELEASE" devfs_ruleset: 6 no_default_route: true +zfs: + - name: zroot/jails/volumes/ingress_letsencrypt + mountpoint: /usr/local/etc/letsencrypt + ingress_routes: - { host: jan.systems, jail: homepage } - { host: jantuomi.fi, redirect: jan.systems } @@ -34,9 +38,10 @@ jail_conf_options: nullfs: [] pkg: + - pcre2 - nginx - - py311-certbot - - py311-certbot-nginx + - py312-certbot + - py312-certbot-nginx files: - src: etc_pf.conf.j2 diff --git a/roles/jails/01_ingress/tasks/main.yml b/roles/jails/01_ingress/tasks/main.yml index 8248c3f..15992bd 100644 --- a/roles/jails/01_ingress/tasks/main.yml +++ b/roles/jails/01_ingress/tasks/main.yml @@ -28,7 +28,7 @@ - "ifconfig epw{{ jail_num }}b vnet {{ jail_name }}" - "ifconfig epw{{ jail_num }}a up" - "jexec {{ jail_name }} ifconfig epw{{ jail_num }}b up" - - "jexec {{ jail_name }} service dhclient restart epw{{ jail_num }}b" + - "jexec {{ jail_name }} dhclient epw{{ jail_num }}b" - "jexec {{ jail_name }} route add 10.6.210.0/24 {{ lan_ipv4_gateway }} || true" exec_poststop: - "ifconfig epw{{ jail_num }}a destroy 2>/dev/null || true" |