base: fstab options can be activated or not
This commit is contained in:
parent
c692105b5c
commit
3c29a6ff10
|
@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
* nagios-nrpe: multiples IP can now be checked with check_ipsecctl_critiques.sh
|
* nagios-nrpe: multiples IP can now be checked with check_ipsecctl_critiques.sh
|
||||||
* base: use a variable for /etc/installurl content
|
* base: use a variable for /etc/installurl content
|
||||||
* base: use "servers" option instead of "server" option for ntpd.conf
|
* base: use "servers" option instead of "server" option for ntpd.conf
|
||||||
|
* base: fstab options can be activated or not
|
||||||
|
|
||||||
### Fixed
|
### Fixed
|
||||||
|
|
||||||
|
|
|
@ -9,4 +9,8 @@ evobsd_system_timeout: 36000
|
||||||
evobsd_path: "$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
evobsd_path: "$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
||||||
cron_root_path: "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
cron_root_path: "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
|
||||||
|
|
||||||
|
evobsd_fstab_softdep: true
|
||||||
|
evobsd_fstab_noatime: true
|
||||||
|
evobsd_fstab_noaxec: true
|
||||||
|
|
||||||
install_url: "https://cdn.openbsd.org/pub/OpenBSD"
|
install_url: "https://cdn.openbsd.org/pub/OpenBSD"
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
regexp: '([^#]\s+{{ fstab_path }}\s+ffs\s+rw)(.*)'
|
regexp: '([^#]\s+{{ fstab_path }}\s+ffs\s+rw)(.*)'
|
||||||
replace: '\1,softdep\2'
|
replace: '\1,softdep\2'
|
||||||
when:
|
when:
|
||||||
|
- evobsd_fstab_softdep | bool
|
||||||
- fstab_content.stdout | regex_search('\s' + fstab_path + '\s')
|
- fstab_content.stdout | regex_search('\s' + fstab_path + '\s')
|
||||||
- not (fstab_content.stdout | regex_search('\s+' + fstab_path + '\s+ffs\s+rw,softdep'))
|
- not (fstab_content.stdout | regex_search('\s+' + fstab_path + '\s+ffs\s+rw,softdep'))
|
||||||
tags:
|
tags:
|
||||||
|
@ -17,6 +18,7 @@
|
||||||
replace: '\1\2,noatime\3'
|
replace: '\1\2,noatime\3'
|
||||||
notify: remount {{ fstab_path }} noatime
|
notify: remount {{ fstab_path }} noatime
|
||||||
when:
|
when:
|
||||||
|
- evobsd_fstab_noatime | bool
|
||||||
- fstab_content.stdout | regex_search('\s' + fstab_path + '\s')
|
- fstab_content.stdout | regex_search('\s' + fstab_path + '\s')
|
||||||
- not (fstab_content.stdout | regex_search('\s+' + fstab_path + '\s+ffs\s+rw\S*noatime'))
|
- not (fstab_content.stdout | regex_search('\s+' + fstab_path + '\s+ffs\s+rw\S*noatime'))
|
||||||
tags:
|
tags:
|
||||||
|
@ -29,6 +31,7 @@
|
||||||
replace: '\1,noexec\3'
|
replace: '\1,noexec\3'
|
||||||
notify: remount {{ fstab_path }} noexec
|
notify: remount {{ fstab_path }} noexec
|
||||||
when:
|
when:
|
||||||
|
- evobsd_fstab_noaxec | bool
|
||||||
- fstab_path == "/tmp"
|
- fstab_path == "/tmp"
|
||||||
- fstab_content.stdout | regex_search('\s' + fstab_path + '\s')
|
- fstab_content.stdout | regex_search('\s' + fstab_path + '\s')
|
||||||
- not (fstab_content.stdout | regex_search('\s+' + fstab_path + '\s+ffs\s+rw,(softdep,)*noexec'))
|
- not (fstab_content.stdout | regex_search('\s+' + fstab_path + '\s+ffs\s+rw,(softdep,)*noexec'))
|
||||||
|
|
Loading…
Reference in a new issue