diff options
| author | Cullum Smith <cullum@sacredheartsc.com> | 2025-03-20 13:33:51 -0400 |
|---|---|---|
| committer | Cullum Smith <cullum@sacredheartsc.com> | 2025-03-20 13:33:51 -0400 |
| commit | f57c0e04db157bbd82e011c46e240c10d92734a3 (patch) | |
| tree | f15e78b889401720c1603db11268bbf507b75f23 /files/usr | |
| parent | 0e6158dc5f0d21f6393a7c99abbdba08eb402372 (diff) | |
| download | infrastructure-f57c0e04db157bbd82e011c46e240c10d92734a3.tar.gz | |
misc updates
Diffstat (limited to 'files/usr')
| -rw-r--r-- | files/usr/local/etc/dovecot/dovecot-ldap-userdb.conf.ext.imap_server | 2 | ||||
| -rw-r--r-- | files/usr/local/sbin/jailctl.freebsd_hypervisor | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/files/usr/local/etc/dovecot/dovecot-ldap-userdb.conf.ext.imap_server b/files/usr/local/etc/dovecot/dovecot-ldap-userdb.conf.ext.imap_server index 6a7ce4e..11ce97f 100644 --- a/files/usr/local/etc/dovecot/dovecot-ldap-userdb.conf.ext.imap_server +++ b/files/usr/local/etc/dovecot/dovecot-ldap-userdb.conf.ext.imap_server @@ -11,7 +11,7 @@ user_attrs = \\ =uid=${dovecot_vmail_uid}, \\ =gid=${dovecot_vmail_uid}, \\ =home=${dovecot_vmail_dir}/%{ldap:uid}, \\ - mailQuota=quota_rule=\*:storage=%{ldap:mailQuota} + mailQuota=quota_rule=*:storage=%{ldap:mailQuota} iterate_attrs = uid=user iterate_filter = (mailAddress=*) diff --git a/files/usr/local/sbin/jailctl.freebsd_hypervisor b/files/usr/local/sbin/jailctl.freebsd_hypervisor index 8719297..99578bd 100644 --- a/files/usr/local/sbin/jailctl.freebsd_hypervisor +++ b/files/usr/local/sbin/jailctl.freebsd_hypervisor @@ -561,7 +561,7 @@ Options: [ $# -eq 0 ] || cmd::usage 'too many arguments' - { [ $terse = true ] || echo 'JAIL STATUS' + { [ $terse = true ] || echo 'JAIL STATUS VERSION' for file in "$JAIL_HOME"/*/jail.conf; do [ -e "$file" ] || continue @@ -575,7 +575,7 @@ Options: else status=stopped fi - printf '%s %s\n' "$name" "$status" + printf '%s %s %s\n' "$name" "$status" "$("${JAIL_HOME}/${name}/os/bin/freebsd-version" 2>/dev/null)" fi done } | column -t @@ -854,6 +854,8 @@ cmd::show(){ jail::exists "$jail" || die "no such jail: ${jail}" + printf -- '---------------------------- FREEBSD VERSION -----------------------------\n' + "${JAIL_HOME}/${jail}/os/bin/freebsd-version" ||: printf -- '------------------------- JAIL CONFIGURATION -------------------------\n' cat "${JAIL_HOME}/${jail}/jail.conf" printf -- '\n---------------------------- ZFS DATASET -----------------------------\n' |