mrrl-containers

commit 8da59f9dad2b4b11a3466c3ef0f103060d1b272f
parent 5a8a76495b457b467ae696868e62ed9bf440018a
Author: ccx <ccx@te2000.cz>
Date:   Tue, 28 May 2024 00:19:16 +0000

Split mail container into networked and non-networked parts

Diffstat:
M
zsh-functions/confz_site_containers_init
 | 
40
++++++++++++++++++++++++++++++++++++----

1 file changed, 36 insertions(+), 4 deletions(-)
diff --git a/zsh-functions/confz_site_containers_init b/zsh-functions/confz_site_containers_init
@@ -11,6 +11,9 @@ typeset -gA site_containers_mountpoints=(
 	audio	/mnt/volumes/audio
 	video	/mnt/volumes/video
 	photos	/mnt/volumes/photos
+	mail-te2000.cz-ccx	/home/ccx/mail/te2000.cz/ccx
+	mail-disroot.org-ccx	/home/ccx/mail/disroot.org/ccx
+	mail-recombee.com-jan.pobrislo	/home/ccx/mail/recombee.com/jan.pobrislo
 )
 
 confz_site_containers_usersvc_simple_check() {
@@ -193,7 +196,6 @@ confz_site_containers_user_check() {
 	UCa senpai
 	UCa profanity
 	UCa gomuks
-	UCa mail
 	UCa testssl
 	UCa tor
 	UCa ssh
@@ -241,6 +243,10 @@ confz_site_containers_user_check() {
 	UC  sndiod    alpine-sndio     $with_audio $in_netns
 	UC  mpd       void-mpd         mount_ro="init audio"
 	UC  {,}alpine-recombee         mount_rw=ccx-git-recombee
+	UCa mail-net                   mount_rw="init mail-te2000.cz-ccx mail-disroot.org-ccx"
+	UC {rcm,alpine}-mail-net       mount_rw="init mail-recombee.com-jan.pobrislo"
+	UC mail alpine-mail-read       mount_rw="init mail-te2000.cz-ccx mail-disroot.org-ccx" $in_netns
+	UC rcm-mail alpine-mail-read   mount_rw="init mail-recombee.com-jan.pobrislo" $in_netns
 
 	# container=alpine-dev
 	# bindroot=$vars[containers_dir]/user/$vars[user]/$container/root
@@ -528,6 +534,32 @@ confz_site_container_images_check() {
 		repositories="main community testing" \
 		image_name=alpine-testssl packages="$alpine_testssl"
 
+	local -a alpine_mail_net=(
+		$alpine_terminal
+		make patch
+		mandoc
+		{mblaze,slrn,msmtp}{,-doc}
+		py3-{setuptools,pip,wheel}  # Python 3 / venv
+		py3-{cryptography,urllib3,certifi,distro,python-gssapi}  # offlineimap3
+		git git-doc # offlineimap3 source
+	)
+	require site_container_alpine :containers_dir :svscan_dir \
+		repositories="main community testing" \
+		image_name=alpine-mail-net packages="$alpine_mail"
+
+	local -a alpine_mail_read=(
+		$alpine_terminal
+		make
+		mandoc
+		{neomutt,mblaze,notmuch,elinks,w3m,lynx,git}{,-doc}
+		py3-{setuptools,pip,wheel}  # Python 3 / venv
+		py3-{notmuch,urwid{,trees},twisted,magic,gpgme}  # alot
+		poppler-utils  # pdftotext
+	)
+	require site_container_alpine :containers_dir :svscan_dir \
+		repositories="main community testing" \
+		image_name=alpine-mail-read packages="$alpine_mail"
+
 	local -a alpine_mail=(
 		$alpine_terminal
 		make patch
@@ -541,9 +573,9 @@ confz_site_container_images_check() {
 		msmtp
 		poppler-utils  # pdftotext
 	)
-	require site_container_alpine :containers_dir :svscan_dir \
-		repositories="main community testing" \
-		image_name=alpine-mail packages="$alpine_mail"
+	#require site_container_alpine :containers_dir :svscan_dir \
+	#	repositories="main community testing" \
+	#	image_name=alpine-mail packages="$alpine_mail"
 
 	local -a alpine_dev_spark=(
 		$alpine_dev_core