Revert "workaround odd dnf issues with samba-4.19.0-0.3.rc2 updates"

This reverts commit 511b5382ec.
The updates have gone stable and we don't need the workaround.
This commit is contained in:
Adam Williamson 2023-08-22 00:18:13 -07:00
parent 0e2eabe336
commit 329d878343
3 changed files with 1 additions and 16 deletions

View File

@ -37,11 +37,6 @@ sub run {
# here we're enrolling not just as a client, but as a replica
# install server packages
assert_script_run "dnf -y group install freeipa-server", 600;
my $advortask = get_var("ADVISORY_OR_TASK");
if ($advortask eq "FEDORA-2023-d21ee6d2e9" || $advortask eq "FEDORA-2023-b2095d4ea1") {
assert_script_run "dnf -y --best update samba*", 600;
}
# we need a lot of entropy for this, and we don't care how good
# it is, so let's use haveged

View File

@ -27,10 +27,6 @@ sub run {
assert_script_run 'printf "[Service]\nEnvironment=OPTIONS=-d5\n" > /etc/systemd/system/named-pkcs11.service.d/debug.conf';
# First install the necessary packages
assert_script_run "dnf -y group install freeipa-server", 600;
my $advortask = get_var("ADVISORY_OR_TASK");
if ($advortask eq "FEDORA-2023-d21ee6d2e9" || $advortask eq "FEDORA-2023-b2095d4ea1") {
assert_script_run "dnf -y --best update samba*", 600;
}
# configure the firewall
for my $service (qw(freeipa-ldap freeipa-ldaps dns)) {
assert_script_run "firewall-cmd --permanent --add-service $service";

View File

@ -26,13 +26,7 @@ sub run {
assert_script_run 'systemctl start haveged.service';
assert_script_run "rm -f /etc/samba/smb.conf";
# First install the necessary packages
my $advortask = get_var("ADVISORY_OR_TASK");
if ($advortask eq "FEDORA-2023-d21ee6d2e9" || $advortask eq "FEDORA-2023-b2095d4ea1") {
assert_script_run "dnf -y --best install samba-dc samba-tools krb5-workstation adcli", 600;
}
else {
assert_script_run "dnf -y install samba-dc samba-tools krb5-workstation adcli", 600;
}
assert_script_run "dnf -y install samba-dc samba-tools krb5-workstation adcli", 600;
# configure the firewall
assert_script_run "firewall-cmd --permanent --add-service samba-dc";
assert_script_run "systemctl restart firewalld.service";