diff --git a/Dockerfile b/Dockerfile index 33be186..7e2eee2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -65,7 +65,8 @@ RUN chmod +x /entrypoint.sh && \ rmdir /etc/cups/ppd && \ ln -s /etc/cups-persist/ppd /etc/cups/ppd && \ sed -i "s:Listen localhost\:631:Port 631\nServerAlias \*:" /etc/cups/cupsd.conf && \ - sed -E -i "s:(Order allow\,deny):\1\n Allow all:" /etc/cups/cupsd.conf + sed -E -i "s:(Order allow\,deny):\1\n Allow all:" /etc/cups/cupsd.conf && \ + useradd guest VOLUME /etc/samba /var/lib/samba /etc/cups-persist diff --git a/entrypoint.sh b/entrypoint.sh index 5417a70..5f5bb84 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -102,7 +102,7 @@ if [[ ! `grep "winbind" /etc/nsswitch.conf` ]]; then sed -i "s#^\(shadow\:\s*compat\)\s*\(.*\)\$#\1 \2 winbind#" /etc/nsswitch.conf fi -pam-auth-update +pam-auth-update --package if [ ! -f /var/lib/samba/private/secrets.tdb ]; then if [ ! -f /run/secrets/$ADMIN_PASSWORD_SECRET ]; then diff --git a/smb.conf.j2 b/smb.conf.j2 index 481dad7..ea29ae4 100644 --- a/smb.conf.j2 +++ b/smb.conf.j2 @@ -27,6 +27,7 @@ log level = {{ LOG_LEVEL }} winbind refresh tickets = Yes winbind use default domain = {{ WINBIND_USE_DEFAULT_DOMAIN }} + guest account = guest rpc start on demand helpers = false printing = cups diff --git a/supervisord.conf b/supervisord.conf index 00177ea..e6bf469 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -5,6 +5,7 @@ user=root [program:smbd] command=/usr/sbin/smbd --foreground --no-process-group +priority=1 redirect_stderr=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 @@ -12,14 +13,17 @@ stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [program:nmbd] +priority=1 command=/usr/sbin/nmbd --foreground --no-process-group redirect_stderr=true [program:winbind] +priority=1 command=/usr/sbin/winbindd --foreground --no-process-group redirect_stderr=true [program:dcerpcd] +priority=100 command=/usr/libexec/samba/samba-dcerpcd --libexec-rpcds --foreground --no-process-group redirect_stderr=true