diff options
| author | Jan Tuomi <jan@jantuomi.fi> | 2026-07-13 16:28:27 +0300 |
|---|---|---|
| committer | Jan Tuomi <jan@jantuomi.fi> | 2026-07-13 16:28:27 +0300 |
| commit | 19f475c3ff2119480b69a6d986f40c56a2fb4e5c (patch) | |
| tree | 76073d6c70f15609ad88762d2859cffd07efc8fc /roles | |
| parent | ada58b1aebd3d92fb258b8d728de619748887ff5 (diff) | |
Python version, volume fixes
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/jail/tasks/jail_setup.yml | 8 | ||||
| -rw-r--r-- | roles/jails/04_taulubot/defaults/main.yml | 14 | ||||
| -rw-r--r-- | roles/jails/06_hommabot/defaults/main.yml | 4 |
3 files changed, 20 insertions, 6 deletions
diff --git a/roles/jail/tasks/jail_setup.yml b/roles/jail/tasks/jail_setup.yml index 3602b6e..538fc6e 100644 --- a/roles/jail/tasks/jail_setup.yml +++ b/roles/jail/tasks/jail_setup.yml @@ -250,6 +250,14 @@ delegate_to: "{{ jail_delegate_host }}" # In-jail provisioning +- name: Set default Python version + copy: + content: "DEFAULT_VERSIONS+=python=3.12 python3=3.12\n" + dest: /etc/make.conf + owner: root + group: wheel + mode: "0644" + - name: Install packages shell: "pkg install -y {{ pkg | join(' ') }}" environment: diff --git a/roles/jails/04_taulubot/defaults/main.yml b/roles/jails/04_taulubot/defaults/main.yml index 5fa27dd..3cac581 100644 --- a/roles/jails/04_taulubot/defaults/main.yml +++ b/roles/jails/04_taulubot/defaults/main.yml @@ -5,12 +5,14 @@ zfs: mountpoint: /usr/local/taulubot/photos pkg: - - python311 - - py311-pip - - py311-setuptools - - py311-build - - py311-installer - - py311-wheel + - python312 + - py312-pip + - py312-setuptools + - py312-build + - py312-installer + - py312-wheel + - python + - pcre2 - git - jpeg-turbo diff --git a/roles/jails/06_hommabot/defaults/main.yml b/roles/jails/06_hommabot/defaults/main.yml index f2c497a..97d237f 100644 --- a/roles/jails/06_hommabot/defaults/main.yml +++ b/roles/jails/06_hommabot/defaults/main.yml @@ -1,5 +1,9 @@ userland: "15.0-RELEASE" +zfs: + - name: zroot/jails/volumes/hommabot_data + mountpoint: /var/db/hommabot + pkg: - node - npm |