From adcb5de4f134b8d4df149a3b4dff55d658b64a55 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Wed, 2 Nov 2022 18:00:09 +0100 Subject: [PATCH] Update to 2022-11-02 18:00 --- roles/pve/files/remove_nag.patch | 10 +++++----- roles/samba/defaults/main.yml | 2 ++ roles/samba/templates/smb.conf.j2 | 2 +- roles/samba/vars/RedHat-8.yml | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/roles/pve/files/remove_nag.patch b/roles/pve/files/remove_nag.patch index 30feac9..eb0f054 100644 --- a/roles/pve/files/remove_nag.patch +++ b/roles/pve/files/remove_nag.patch @@ -1,11 +1,11 @@ ---- /usr/share/perl5/PVE/API2/Subscription.pm.orig 2018-11-22 09:29:26.612623539 +0100 -+++ /usr/share/perl5/PVE/API2/Subscription.pm 2018-11-22 09:30:07.639521319 +0100 +--- /usr/share/perl5/PVE/API2/Subscription.pm.orig 2022-11-02 13:38:18.626006187 +0100 ++++ /usr/share/perl5/PVE/API2/Subscription.pm 2022-11-02 13:41:27.097618728 +0100 @@ -114,7 +114,7 @@ - my $info = PVE::INotify::read_file('subscription'); + my $info = read_etc_subscription(); if (!$info) { my $no_subscription_info = { -- status => "NotFound", -+ status => "Active", +- status => "notfound", ++ status => "active", message => "There is no subscription key", url => $url, }; diff --git a/roles/samba/defaults/main.yml b/roles/samba/defaults/main.yml index e8302bc..eac7c23 100644 --- a/roles/samba/defaults/main.yml +++ b/roles/samba/defaults/main.yml @@ -25,6 +25,8 @@ samba_log_level: > dns:3@/var/log/samba/dns.log kerberos:2@/var/log/samba/kerberos.log ldb:2@/var/log/samba/ldb.log + winbind:3@/var/log/samba/winbind.log + idmap:3@/var/log/samba/idmap.log samba_serve_homes: False diff --git a/roles/samba/templates/smb.conf.j2 b/roles/samba/templates/smb.conf.j2 index 3069f75..e3196b2 100644 --- a/roles/samba/templates/smb.conf.j2 +++ b/roles/samba/templates/smb.conf.j2 @@ -6,7 +6,7 @@ idmap config * : backend = tdb idmap config * : range = 10000-19999 idmap config {{ samba_domain | upper }} : backend = sss - idmap config {{ samba_domain | upper }} : range 200000-2147483647 + idmap config {{ samba_domain | upper }} : range = 200000-2147483647 {% for domain in samba_trusted_domains %} idmap config {{ domain.name | upper }} : backend = sss {% endfor %} diff --git a/roles/samba/vars/RedHat-8.yml b/roles/samba/vars/RedHat-8.yml index 7c4a5fd..92cf529 100644 --- a/roles/samba/vars/RedHat-8.yml +++ b/roles/samba/vars/RedHat-8.yml @@ -17,3 +17,4 @@ samba_dc_packages: samba_member_packages: - samba-winbind + - samba-winbind-clients