From 4067eed9e6f9bd69db172d176d080bc1f32b9ffa Mon Sep 17 00:00:00 2001
From: =?utf8?q?Zolt=C3=A1n=20Felleg?= <zoltan.felleg@userrendszerhaz.hu>
Date: Wed, 28 Oct 2020 14:20:10 +0100
Subject: [PATCH] Updated ldap.usr, vhost1.usr and ws.pm (Fedora 33 updates).

---
 sources/ldap.usr/envvars                       | 4 ++--
 sources/ldap.usr/preinstall/01_backupldapdb.sh | 8 ++++----
 sources/vhost1.usr/99_setupsystem.sh           | 4 ++++
 sources/ws.pm/firstboot/10_certbot.sh          | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sources/ldap.usr/envvars b/sources/ldap.usr/envvars
index f5ab4fa..0cacc9b 100644
--- a/sources/ldap.usr/envvars
+++ b/sources/ldap.usr/envvars
@@ -2,5 +2,5 @@ DISTRIBUTION=Fedora
 DISTRIBUTION_VERSION=33
 ROOT_PACKAGES="hostname initscripts iproute rootfiles systemd-udev"
 BASE_PACKAGES="NetworkManager iputils logrotate rsyslog tar vim-minimal"
-SPEC_PACKAGES="openssh-server openssh-clients openssh-ldap openssl sudo"
-SPEC_PACKAGES="$SPEC_PACKAGES authselect openldap-servers openldap-clients nss-pam-ldapd oddjob-mkhomedir pam_ssh passwd python3 sssd-ldap"
+SPEC_PACKAGES="openssh-server openssh-clients openssl sudo"
+SPEC_PACKAGES="$SPEC_PACKAGES authselect openldap-servers openldap-clients oddjob-mkhomedir pam_ssh passwd python3 sssd-ldap"
diff --git a/sources/ldap.usr/preinstall/01_backupldapdb.sh b/sources/ldap.usr/preinstall/01_backupldapdb.sh
index 8c38c77..7159874 100755
--- a/sources/ldap.usr/preinstall/01_backupldapdb.sh
+++ b/sources/ldap.usr/preinstall/01_backupldapdb.sh
@@ -2,17 +2,17 @@
 
 
 REAL_PATH=$(realpath $(dirname $0))
-CONTAINER_NAME=$1
-CONTAINER_ROOTFS=$2
-CONTAINER_SOURCE_PATH=$3
+ENV_FILE=$1
+source $ENV_FILE
 
 
+chmod 600 $REAL_PATH/user-lxcsetup-2020
 ssh -i $REAL_PATH/user-lxcsetup-2020 -l root ldap.usr.user.hu echo hello
 RC=$?
 if [ $RC -eq 0 ]
 then
     ssh -i $REAL_PATH/user-lxcsetup-2020 -l root ldap.usr.user.hu systemctl stop slapd.service
-    ssh -i $REAL_PATH/user-lxcsetup-2020 -l root ldap.usr.user.hu slapcat -n 2 >/tmp/data.ldif
+    ssh -i $REAL_PATH/user-lxcsetup-2020 -l root ldap.usr.user.hu "slapcat -n 2 >/tmp/data.ldif"
     scp -i $REAL_PATH/user-lxcsetup-2020 root@ldap.usr.user.hu:/tmp/data.ldif \
         $CONTAINER_SOURCE_PATH/firstboot/data.ldif
     ssh -i $REAL_PATH/user-lxcsetup-2020 -l root ldap.usr.user.hu systemctl start slapd.service
diff --git a/sources/vhost1.usr/99_setupsystem.sh b/sources/vhost1.usr/99_setupsystem.sh
index e5d0fac..7178041 100755
--- a/sources/vhost1.usr/99_setupsystem.sh
+++ b/sources/vhost1.usr/99_setupsystem.sh
@@ -6,12 +6,16 @@ timedatectl set-timezone Europe/Budapest
 
 dnf install \
     chrony \
+    cronie \
     infiniband-diags \
+    ipmitool \
     logrotate \
     lxc \
     lxc-templates \
+    mailx \
     mercurial-py3 \
     opensm \
+    postfix \
     rdma-core \
     rsyslog \
     screen \
diff --git a/sources/ws.pm/firstboot/10_certbot.sh b/sources/ws.pm/firstboot/10_certbot.sh
index b3ab464..470a796 100755
--- a/sources/ws.pm/firstboot/10_certbot.sh
+++ b/sources/ws.pm/firstboot/10_certbot.sh
@@ -34,7 +34,7 @@ then
     done
     /usr/bin/cp \
         --archive \
-        /usr/lib/python3.8/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf \
+        /usr/lib/python3.9/site-packages/certbot_apache/_internal/tls_configs/current-options-ssl-apache.conf \
         /etc/letsencrypt/options-ssl-apache.conf
     systemctl enable certbot-renew.timer
     systemctl start certbot-renew.timer
-- 
2.54.0