diff options
| -rw-r--r-- | files/etc/pam.d/znc.znc_server | 2 | ||||
| -rw-r--r-- | scripts/hostclass/nfs_server | 2 | ||||
| -rw-r--r-- | scripts/hostclass/znc_server | 4 | ||||
| -rw-r--r-- | scripts/os/freebsd/51-autofs | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/files/etc/pam.d/znc.znc_server b/files/etc/pam.d/znc.znc_server deleted file mode 100644 index 6479aca..0000000 --- a/files/etc/pam.d/znc.znc_server +++ /dev/null @@ -1,2 +0,0 @@ -auth required /usr/local/lib/pam_ldap.so -account required /usr/local/lib/pam_ldap.so diff --git a/scripts/hostclass/nfs_server b/scripts/hostclass/nfs_server index ce47cfe..ec06bfe 100644 --- a/scripts/hostclass/nfs_server +++ b/scripts/hostclass/nfs_server @@ -43,5 +43,5 @@ sysrc -v gssd_env="KRB5_KTNAME=${keytab_dir}/host.keytab" install_template -m 0644 /etc/exports for service in gssd nfsuserd mountd nfsd; do - service "$service" restart + service "$service" status || service "$service" start done diff --git a/scripts/hostclass/znc_server b/scripts/hostclass/znc_server index fd6b715..58f1d8a 100644 --- a/scripts/hostclass/znc_server +++ b/scripts/hostclass/znc_server @@ -38,11 +38,9 @@ install_directory -o "$znc_user" -g "$znc_user" -m 0700 \ install_template -o "$znc_user" -g "$znc_user" -m 0600 "${znc_home}/moddata/cyrusauth/.registry" # Copy saslauthd configuration. -# TODO: use ldap module for saslauthd. install_template -m 0644 \ /usr/local/lib/sasl2/znc.conf \ - /usr/local/etc/saslauthd.conf \ - /etc/pam.d/znc + /usr/local/etc/saslauthd.conf # Allow znc to read the saslauthd socket. install_directory -m 0750 -o "$saslauthd_user" -g "$znc_user" "$saslauthd_runtime_dir" diff --git a/scripts/os/freebsd/51-autofs b/scripts/os/freebsd/51-autofs index 4fe3c52..a4549c8 100644 --- a/scripts/os/freebsd/51-autofs +++ b/scripts/os/freebsd/51-autofs @@ -27,7 +27,7 @@ install_file -m 0644 /etc/auto_master install_file -m 0555 /usr/local/libexec/idm-autofs-map ln -snfv /usr/local/libexec/idm-autofs-map /etc/autofs/include -# No nfscbd: causes kernel panics on FreeBSD 14.1 +# TODO: nfscbd causes kernel panics on FreeBSD 14.1, disabled for now. for service in gssd nfsclient nfsuserd automount automountd autounmountd; do service "$service" status || service "$service" start done |