aboutsummaryrefslogtreecommitdiff
path: root/scripts/hostclass
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/hostclass')
-rw-r--r--scripts/hostclass/nfs_server2
-rw-r--r--scripts/hostclass/znc_server4
2 files changed, 2 insertions, 4 deletions
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"