dev #2

Merged
pi-farm merged 66 commits from dev into main 2026-04-09 13:56:20 +00:00
Showing only changes of commit 614e0b88db - Show all commits

View File

@@ -81,12 +81,13 @@ RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.s
printf 'XKBMODEL="pc105"\nXKBLAYOUT="%s"\nXKBVARIANT=""\nXKBOPTIONS=""\nBACKSPACE="guess"\n' "${COUNTRY}" > /etc/default/keyboard && \ printf 'XKBMODEL="pc105"\nXKBLAYOUT="%s"\nXKBVARIANT=""\nXKBOPTIONS=""\nBACKSPACE="guess"\n' "${COUNTRY}" > /etc/default/keyboard && \
dpkg-reconfigure -f noninteractive keyboard-configuration dpkg-reconfigure -f noninteractive keyboard-configuration
#COPY config/pam/ /etc/pam.d/ # NEU: Systemweite statische Konfigurationen für LDAP/PAM/Sudo
#COPY config/nsswitch.conf /etc/nsswitch.conf # 1. Entfernt die gefährliche %users Regel
#COPY config/xrdp/ /etc/xrdp/ # 2. Sagt nsswitch, dass Sudoers auch im SSS (LDAP) gesucht werden sollen
#COPY config/ldap/ /etc/ldap/ # 3. Aktiviert das automatische Erstellen von Home-Verzeichnissen (mkhomedir)
#COPY config/skel/ /etc/skel/ RUN sed -i '/%users/s/^/# /' /etc/sudoers && \
#COPY config/sudoers /etc/sudoers echo "sudoers: files sss" >> /etc/nsswitch.conf && \
echo "session required pam_mkhomedir.so skel=/etc/skel/ umask=0022" >> /etc/pam.d/common-session
RUN chmod 440 /etc/sudoers && \ RUN chmod 440 /etc/sudoers && \
mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \ mkdir -p /etc/sssd && chown root:root /etc/sssd && chmod 755 /etc/sssd && \
@@ -97,7 +98,7 @@ RUN chmod 440 /etc/sudoers && \
echo "LANG=${LANG}" >> /etc/environment && \ echo "LANG=${LANG}" >> /etc/environment && \
echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \ echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \
echo "LC_ALL=${LC_ALL}" >> /etc/environment && \ echo "LC_ALL=${LC_ALL}" >> /etc/environment && \
sed -i '1i export LANG=${LANG}\nexport LANGUAGE=${LANGUAGE}\nexport LC_ALL=${LC_ALL}' /etc/xrdp/startwm.sh && \ sed -i '2i export LANG=${LANG}\nexport LANGUAGE=${LANGUAGE}\nexport LC_ALL=${LC_ALL}\npulseaudio --start\npactl load-module module-xrdp-sink.so\npactl load-module module-xrdp-source.so' /etc/xrdp/startwm.sh && \
chmod +x /etc/xrdp/startwm.sh && \ chmod +x /etc/xrdp/startwm.sh && \
mkdir -p /etc/xdg/xfce4 && \ mkdir -p /etc/xdg/xfce4 && \
echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc echo "setxkbmap ${COUNTRY}" >> /etc/xdg/xfce4/xinitrc