From 229463e5bd5f30cad6d2a19579cd7af336be71aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Wed, 14 Apr 2021 16:25:50 +0300 Subject: [PATCH] =?UTF-8?q?sys-apps/calculate-utils:=20=D0=BE=D0=B1=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=83=D1=82=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * переписана логика восстановления точек монтирования компьютера, введённого в домен, после выхода из ждущего режима --- .../Depends/calculate-utils | 2 +- .../nginx/ssl/generate_noname_cert | 2 +- .../sys-auth/elogind/system-sleep/domain | 49 +++++++++++++++++++ .../sys-auth/elogind/system-sleep/domain.del | 1 + .../.calculate_directory | 2 +- sys-apps/calculate-utils/Manifest | 1 + .../calculate-utils-3.6.9.11.ebuild | 24 +++++++++ 7 files changed, 78 insertions(+), 3 deletions(-) create mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/elogind/system-sleep/domain create mode 100644 profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/elogind/system-sleep/domain.del create mode 100644 sys-apps/calculate-utils/calculate-utils-3.6.9.11.ebuild diff --git a/profiles/templates/3.6/2_ac_install_merge/Depends/calculate-utils b/profiles/templates/3.6/2_ac_install_merge/Depends/calculate-utils index 59f322c89..d65044f68 100644 --- a/profiles/templates/3.6/2_ac_install_merge/Depends/calculate-utils +++ b/profiles/templates/3.6/2_ac_install_merge/Depends/calculate-utils @@ -1 +1 @@ -# Calculate append=skip merge(sys-apps/calculate-utils)!= merge=sys-apps/portage,app-portage/layman +# Calculate append=skip merge(sys-apps/calculate-utils)!= merge=sys-apps/portage,app-portage/layman,sys-auth/elogind diff --git a/profiles/templates/3.6/2_ac_install_merge/www-servers/nginx/ssl/generate_noname_cert b/profiles/templates/3.6/2_ac_install_merge/www-servers/nginx/ssl/generate_noname_cert index c542d6963..540d4c67a 100644 --- a/profiles/templates/3.6/2_ac_install_merge/www-servers/nginx/ssl/generate_noname_cert +++ b/profiles/templates/3.6/2_ac_install_merge/www-servers/nginx/ssl/generate_noname_cert @@ -1,4 +1,4 @@ # Calculate exec=/bin/bash exists(/etc/nginx/ssl/nginx.key)==||exists(/etc/nginx/ssl/nginx.crt)== -openssl req -x509 -subj "/CN=_" -nodes -days 365 -newkey rsa:2048 -keyout /etc/nginx/ssl/nginx.key -out /etc/nginx/ssl/nginx.crt &>/dev/null +openssl req -x509 -subj "/CN=_" -nodes -days 3650 -newkey rsa:2048 -keyout /etc/nginx/ssl/nginx.key -out /etc/nginx/ssl/nginx.crt &>/dev/null true diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/elogind/system-sleep/domain b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/elogind/system-sleep/domain new file mode 100644 index 000000000..2af919e62 --- /dev/null +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/elogind/system-sleep/domain @@ -0,0 +1,49 @@ +# Calculate chmod=0755 module(client)!=&&client.os_remote_auth!= +#!/bin/bash + +DEBUG_LOG=/dev/null + +get_userinfo_data() { + /usr/libexec/calculate/cl-variable --value desktop.cl_desktop_online_data +} + +remounting() { + local userinfo_data="$(get_userinfo_data)" + local domain_host="#-client.os_remote_auth-#" + OIFS="$IFS" + IFS=',' + for userinfo_row in $userinfo_data + do + IFS=':' + read -a userinfo <<<${userinfo_row} + IFS=',' + local username="${userinfo[0]}" + local domainset="${userinfo[3]}" + if [[ ${domainset} == 'on' ]] + then + echo "Umounting remote resources for ${username}" &>>$DEBUG_LOG + umount -l /home/${username}/Home + umount -l /home/${username}/Share + umount -l /home/${username}/FTP + + for COUNT in $( seq 0 32 ) + do + if ping -w4 -i0.5 -c3 $domain_host &>$DEBUG_LOG + then + cl-client-sync-login --sync off --unmount-on-error off $username &>>$DEBUG_LOG + break + else + sleep 0.5 + fi + done + fi + done + IFS="$OIFS" +} + +case $1/$2 in + post/*) + echo "Handle $1/$2 by module domain" >>$DEBUG_LOG + remounting & + ;; +esac diff --git a/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/elogind/system-sleep/domain.del b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/elogind/system-sleep/domain.del new file mode 100644 index 000000000..19a203fb2 --- /dev/null +++ b/profiles/templates/3.6/3_ac_install_live/1-merge/sys-auth/elogind/system-sleep/domain.del @@ -0,0 +1 @@ +# Calculate append=remove name=domain module(client)==||client.os_remote_auth== diff --git a/profiles/templates/3.6/5_ac_client_configure/.calculate_directory b/profiles/templates/3.6/5_ac_client_configure/.calculate_directory index 731475dc1..1036bf2c1 100644 --- a/profiles/templates/3.6/5_ac_client_configure/.calculate_directory +++ b/profiles/templates/3.6/5_ac_client_configure/.calculate_directory @@ -1 +1 @@ -# Calculate append=skip module(client)!=&&client.ac_client_configure==on||install.ac_install_live==on&&merge(sys-apps/calculate-utils)!=&&module(client)!=&&ini(merge-calculate.client)==||install.ac_install_live==on&&merge(sys-apps/calculate-utils)!=&&module(client)==&&ini(merge-calculate.client)!= merge=gnome-base/gdm,net-misc/openssh,sys-apps/sysvinit,sys-auth/nss_ldap,sys-libs/glibc,x11-base/xorg-server,x11-misc/lightdm,sys-auth/pambase,app-admin/sudo +# Calculate append=skip module(client)!=&&client.ac_client_configure==on||install.ac_install_live==on&&merge(sys-apps/calculate-utils)!=&&module(client)!=&&ini(merge-calculate.client)==||install.ac_install_live==on&&merge(sys-apps/calculate-utils)!=&&module(client)==&&ini(merge-calculate.client)!= merge=gnome-base/gdm,net-misc/openssh,sys-apps/sysvinit,sys-auth/nss_ldap,sys-libs/glibc,x11-base/xorg-server,x11-misc/lightdm,sys-auth/pambase,app-admin/sudo,sys-auth/elogind diff --git a/sys-apps/calculate-utils/Manifest b/sys-apps/calculate-utils/Manifest index 27beae83d..01a83b81d 100644 --- a/sys-apps/calculate-utils/Manifest +++ b/sys-apps/calculate-utils/Manifest @@ -6,6 +6,7 @@ DIST calculate-client-3.6.9.2.tar.bz2 33726 BLAKE2B 21685da116a0782bda87e530b6cb DIST calculate-client-3.6.9.4.tar.bz2 33868 BLAKE2B 23f1465486edb11689cc1fca9f9ede6cf31615ce61026be6e935f4f6d3c35cb2b4d8bdcd90f1c99426d572d4050b60e85193bf5fa41c29577f61d6054e8b37ec SHA512 1ef816c2e362e55632332f1f0b6fea7c458cc577fb587a032e5e07bdcf46e97a2bd9ed7aeebb70e8d4e7c54c75665a7544d449deeac2ade1d2529212d2f821c5 DIST calculate-client-3.6.9.5.tar.bz2 34009 BLAKE2B 9c08138f32ad6f68d6b0db8b1339bf29b0b93d0addbac6c5c8c8f420a829868b5424193aea1f90ff53fdf1b22d0fa739a6c01bfff5646d0f88c5df0b2486dfd2 SHA512 e2cf66a6cc4df057cecd72a8b05f1c35f2cbbaea9a720cc90924aa19cd6446ff8f084b1de70dc6f5d4f9ac28ed84be28e225b93901168f9571157edc071caa6b DIST calculate-client-3.6.9.6.tar.bz2 34003 BLAKE2B 241aacf88e278cf26868f5f19b359f588b5b8aa252a82d3180a1f7e37e8cf2721e72fb9f60544807ff59c998f16c73c3eda7fde068b5b22a9ef03f4b40a1280f SHA512 a350e1af37b84d4c077c6de94a83f69a54528d2b51a09b71d470b11a192ef218633cda939646b63bef25c58b4c52d7da4cec1eeb40d3049ab44e105d4ecf6d53 +DIST calculate-client-3.6.9.8.tar.bz2 32953 BLAKE2B a99f1745662af8cd8ff63c7278f49f024aa6d94c2e38cc56148315910c77b98cdaef4ce2eaa52a3e8acb6e669ac1ed35c939c5c01dd91afde53b5732f50d0aa0 SHA512 aaedf7266e2a7ddddb1f370eb207f122fee4523a197d31acf5cd0f9f2512c583189240e8775875886b27f7865fefe1a18a255b440046a26696a46c422918e6dd DIST calculate-client-3.6.9.tar.bz2 33720 BLAKE2B b79557317dbf0f958859c07d40d8a19ea40ded5bd3417ad12e007c417db0f01070391e1a62a1e8b92d2001eed799f70f000c3d21cdb2a86185ada35b5ca18c1d SHA512 4347cdf6bdf619c0895f03da41db44bce2e33452bccb0969d637cec4966ca2f87cc3b72d4a6eeec8a055ad05adcb8d76ecedcde8c6fad0fc59279531fa837013 DIST calculate-console-3.6.8.tar.bz2 24777 BLAKE2B ae2a75832940a91f7dc169493269b736fc53f41f61bf0b62ff16be3cbbf0d4732a90e8a5f4d1574a64fa7701d266b2ee6f232946fb777d08db7cdf545580dc34 SHA512 4917a2662fed949c07c039721d9aba1cfe46171dfe942894c6d1811f26be278c20629e20586fbe1d3b2b374089e51ca68c104a7b80c2fd4d55d49f0f3f17ee7a DIST calculate-console-3.6.9.tar.bz2 24744 BLAKE2B 5e3d4ef8ae89a24aef15d3498b163555e519b5c6ee4ac3375380c04271fbbbfc4a05620395fad2228d5cb3b3165ece51976ab1a415f426901a3b57153bff4889 SHA512 c9d62161683dcfdfcbb9e0301d16d4ff595f41d270f7dc2f965652f625c29b3d1d8217d664ba109bc7d6ed1eefacf501010379bd6d70c017aadab7df71f86ab6 diff --git a/sys-apps/calculate-utils/calculate-utils-3.6.9.11.ebuild b/sys-apps/calculate-utils/calculate-utils-3.6.9.11.ebuild new file mode 100644 index 000000000..4596307cd --- /dev/null +++ b/sys-apps/calculate-utils/calculate-utils-3.6.9.11.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="7" +PYTHON_COMPAT=(python2_7) + +declare -A CALCULATE_MODULES=( + ["lib"]="3.6.9.4" + ["install"]="3.6.9.9" + ["client"]="3.6.9.8" + ["desktop"]="3.6.9.2" + ["update"]="3.6.9.1" +) + +inherit calculate-utils-r12 + +DESCRIPTION="A set of Calculate utilities for system installation, build and upgrade" +HOMEPAGE="http://www.calculate-linux.org/main/en/calculate_utilities" + +LICENSE="Apache-2.0" +SLOT="3" +KEYWORDS="amd64" +