diff options
| -rw-r--r-- | tasks/general.yml | 13 | ||||
| -rw-r--r-- | tasks/zfs.yml | 10 | ||||
| -rw-r--r-- | templates/etc_fstab.j2 | 7 | ||||
| -rw-r--r-- | templates/etc_rc.conf.j2 | 2 |
4 files changed, 24 insertions, 8 deletions
diff --git a/tasks/general.yml b/tasks/general.yml index e46da9d..f97d44a 100644 --- a/tasks/general.yml +++ b/tasks/general.yml @@ -14,3 +14,16 @@ group: wheel mode: "0644" register: rc_conf + +- name: Set up fstab + template: + src: etc_fstab.j2 + dest: /etc/fstab + owner: root + group: wheel + mode: "0644" + register: fstab + +- name: Run mount -a + shell: mount -a + when: fstab.changed diff --git a/tasks/zfs.yml b/tasks/zfs.yml index c5d38f5..59495dc 100644 --- a/tasks/zfs.yml +++ b/tasks/zfs.yml @@ -15,17 +15,11 @@ mode: "0755" register: rc_zpool_gpt_labels -- name: Start zpool_gpt_labels +- name: Run zpool_gpt_labels service: name: zpool_gpt_labels state: started - register: started_zpool_gpt_labels - -- name: Restart zpool_gpt_labels - service: - name: zpool_gpt_labels - state: restarted - when: not started_zpool_gpt_labels.changed and rc_zpool_gpt_labels.changed + when: rc_zpool_gpt_labels.changed - name: Install smartd package: diff --git a/templates/etc_fstab.j2 b/templates/etc_fstab.j2 new file mode 100644 index 0000000..7b42a69 --- /dev/null +++ b/templates/etc_fstab.j2 @@ -0,0 +1,7 @@ +# Device Mountpoint FStype Options Dump Pass# +/dev/gpt/efiboot0 /boot/efi msdosfs rw 2 2 +/dev/nda0p3.eli none swap sw 0 0 +/dev/nda1p3.eli none swap sw 0 0 +/dev/nda2p3.eli none swap sw 0 0 +/dev/nda3p3.eli none swap sw 0 0 +tmpfs /tmp tmpfs rw,mode=777,size=2g 0 0 diff --git a/templates/etc_rc.conf.j2 b/templates/etc_rc.conf.j2 index c7e7b83..4b5d739 100644 --- a/templates/etc_rc.conf.j2 +++ b/templates/etc_rc.conf.j2 @@ -23,3 +23,5 @@ syslogd_flags="-s" jail_enable="YES" jail_parallel_start="YES" nginx_enable="YES" +clear_tmp_enable="YES" +cleanvar_enable="YES" |