From patchwork Tue Oct 13 16:07:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 3527 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSk01jkz3x1S for ; Tue, 13 Oct 2020 16:08:21 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4C9gSg3ncBzvc; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4C9gSg1rMXz303x; Tue, 13 Oct 2020 16:08:19 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4C9gSd5B9Jz2xZt for ; Tue, 13 Oct 2020 16:08:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 4C9gSc6x6kzlb; Tue, 13 Oct 2020 16:08:16 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vxvhdb8jlrpGw5I6F3x5y1ZgoRCEIG0hYwN1zjC7DSI=; b=I2U1JnjobD3iGe4CNWpzcj6ZKFSHF9IolJ6PTH+6qa1XWkDEhQraI1eOCzRhrA3JMQ8mXn M64JLRX/UAQxD4Ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1602605297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=vxvhdb8jlrpGw5I6F3x5y1ZgoRCEIG0hYwN1zjC7DSI=; b=HWKU27UDoiv0n7V55886HcL9pTL23j5+nIsEjYE8Y3ckdYv4l5Rhxv4ICKReKNiM2uF3K3 CgI4SYK2uAjxp1v0fzLg/tcXtPHVkFnVX1q/fSmUXRDEhETOwDBttkiwOZijE9PTyQbw9n rTTP7LpIVqXClNLTb7R2G5zTC8uvgSLJDPc4EMzii8lfbNBy2JfHahW4Czprq790vIjtat NZFtu2xYUtcu5xLxWwtjw2vdgEUv8nTeu2iDiAOOwn1ndOM/zESC6kscPMS59I8xG1KJuf 447n/BZjnZMqre2ScGgtXEAvEgtVaBQJeXoJQ93mqkWM3iJe2eCHkOA9e7XJXg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 01/54] samba: Migrate configuration from Samba 3.6 to 4.x Date: Tue, 13 Oct 2020 16:07:19 +0000 Message-Id: <20201013160812.27754-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- src/paks/samba/update.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/paks/samba/update.sh b/src/paks/samba/update.sh index 648b025b7..76875657b 100644 --- a/src/paks/samba/update.sh +++ b/src/paks/samba/update.sh @@ -33,5 +33,10 @@ fi extract_files restore_backup ${NAME} -echo "passdb backend = smbpasswd" >> /var/ipfire/samba/smb.conf + +# Migrate configuration from Samba 3.6 to 4.x +sed -i /var/ipfire/samba/smb.conf \ + -e "/^display charset =/d" \ + -e "s/^security = share$/security = user/" + /usr/local/bin/sambactrl smbstart