diff options
| author | Cullum Smith <cullum@sacredheartsc.com> | 2024-10-21 09:17:49 -0400 |
|---|---|---|
| committer | Cullum Smith <cullum@sacredheartsc.com> | 2024-10-21 09:17:49 -0400 |
| commit | 8e3d7dfa20b966b928078d8071d10fb186a0d781 (patch) | |
| tree | 60a2a98dd6ae9148d1cf4b8d2f3ec53b9bab41c1 /scripts/hostclass | |
| parent | 18e46bcafc2316c53d167cf6550fb69bd4e3be79 (diff) | |
| download | infrastructure-8e3d7dfa20b966b928078d8071d10fb186a0d781.tar.gz | |
cleanup nfs1 host script
Diffstat (limited to 'scripts/hostclass')
| -rw-r--r-- | scripts/hostclass/nfs_server | 3 | ||||
| -rw-r--r-- | scripts/hostclass/pkg_repository | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/scripts/hostclass/nfs_server b/scripts/hostclass/nfs_server index ec06bfe..a775859 100644 --- a/scripts/hostclass/nfs_server +++ b/scripts/hostclass/nfs_server @@ -13,6 +13,9 @@ nfs_dataset="${state_dataset}/nfs" # Create ZFS dataset for NFS share. create_dataset -o "mountpoint=${nfs_root}" "${nfs_dataset}" +# Allow NFSv4 ACLs to propagate. +zfs set aclinherit=passthrough aclmode=passthrough "$nfs_dataset" + # Create nfs service principal and keytab. add_principal -nokey -x "containerdn=${services_basedn}" "nfs/${fqdn}" ktadd -k "${keytab_dir}/host.keytab" "nfs/${fqdn}" diff --git a/scripts/hostclass/pkg_repository b/scripts/hostclass/pkg_repository index 7226b77..969dff7 100644 --- a/scripts/hostclass/pkg_repository +++ b/scripts/hostclass/pkg_repository @@ -99,8 +99,7 @@ install_directory -m 0555 "${poudriere_data_dir}/data/packages/poudriere" # Create cron job to update packages automatically. install_file -m 0555 /usr/local/libexec/poudriere-cron -echo "@weekly root lockf -t 0 /tmp/poudriere-cron.lock /usr/local/libexec/poudriere-cron $(echo "$poudriere_versions" | tr . _)" \ - | tee /etc/cron.d/poudriere +install_file -m 0644 /etc/cron.d/poudriere # Now that we have a valid repo, switch the pkg repo to the local filesystem. install_directory -m 0755 \ |