diff options
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | playbook.yml | 11 | ||||
| -rw-r--r-- | tasks/jails.yml | 7 | ||||
| -rw-r--r-- | tasks/jails_dataset.yml (renamed from tasks/jail_datasets.yml) | 0 | ||||
| -rw-r--r-- | tasks/jails_single.yml (renamed from tasks/jail_single.yml) | 0 |
5 files changed, 15 insertions, 8 deletions
@@ -6,7 +6,6 @@ This repository describes my home server setup with Ansible. The server machine 1. Download a recent FreeBSD release. Tested with https://download.freebsd.org/releases/amd64/amd64/ISO-IMAGES/14.3/FreeBSD-14.3-RELEASE-amd64-memstick.img. 2. Run the installer off a USB drive. During installation, configure: - - a Finnish keymap - hostname "pursotin" - an Auto-ZFS setup with Root-on-ZFS, pool name "zroot" @@ -34,9 +33,11 @@ PermitRootLogin yes Use an [.envrc file](https://direnv.net/) to provide secrets through the shell environment. Required variables are listed in `playbook.yml`. ```shell -ansible-playbook -i inventory playbook.yml +ansible-playbook -i inventory playbook.yml -t [tag1] [tag2] ... ``` +See `playbook.yml` for available tags. + ## Author Jan Tuomi, \<jan at jantuomi.fi\>. diff --git a/playbook.yml b/playbook.yml index fd9d2ad..f99048c 100644 --- a/playbook.yml +++ b/playbook.yml @@ -55,16 +55,25 @@ tasks: - name: Run general tasks + tags: [general] import_tasks: tasks/general.yml - name: Run network tasks + tags: [network] import_tasks: tasks/network.yml - name: Run email tasks + tags: [email] import_tasks: tasks/email.yml - name: Run ZFS tasks + tags: [zfs] import_tasks: tasks/zfs.yml - - name: Run jails tasks + - name: Run common jails tasks + tags: [jails] import_tasks: tasks/jails.yml + + - name: Run ingress jail tasks + tags: [jail_ingress] + import_tasks: tasks/jail_ingress.yml diff --git a/tasks/jails.yml b/tasks/jails.yml index 7cbe707..99eb938 100644 --- a/tasks/jails.yml +++ b/tasks/jails.yml @@ -15,7 +15,7 @@ - { name: "zroot/jails/containers" } loop_control: loop_var: dataset - include_tasks: jail_datasets.yml + include_tasks: jails_dataset.yml - name: Check if userland snapshot already exists shell: zfs list -t snapshot -o name | grep -Fxq "zroot/jails/templates/{{ jail_userland_version }}@base" @@ -71,7 +71,4 @@ loop: "{{ jails }}" loop_control: loop_var: jail - include_tasks: jail_single.yml - -- name: Configure ingress jail - include_tasks: jail_ingress.yml + include_tasks: jails_single.yml diff --git a/tasks/jail_datasets.yml b/tasks/jails_dataset.yml index 9466c46..9466c46 100644 --- a/tasks/jail_datasets.yml +++ b/tasks/jails_dataset.yml diff --git a/tasks/jail_single.yml b/tasks/jails_single.yml index 9d539d0..9d539d0 100644 --- a/tasks/jail_single.yml +++ b/tasks/jails_single.yml |