calculate
/
calculate-overlay
6
1
Fork 2
Code Issues Pull Requests 2 Releases Wiki Activity

sys-apps/calculate-server: обновление

Browse Source 
* отключена запаковка профиля пользователя при репликации
mhiretskiy 2391
Хирецкий Михаил 3 years ago
parent 575c373bee
commit 5da45d4e6d
2 changed files with 269 additions and 0 deletions
Show Stats Download Patch File Download Diff File

191
sys-apps/calculate-server/calculate-server-2.1.20-r1.ebuild
Unescape View File

@ -0,0 +1,191 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="5"
PYTHON_COMPAT=(python2_7)
DISTUTILS_USE_SETUPTOOLS=manual
inherit distutils2 eutils
SRC_URI="ftp://ftp.calculate-linux.org/calculate/source/calculate2/${PN}/${P}.tar.bz2
http://mirror.yandex.ru/calculate/source/calculate2/${PN}/${P}.tar.bz2"
DESCRIPTION="Configuration utility for Linux services"
HOMEPAGE="http://www.calculate-linux.org/main/en/calculate2"
LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="calculate_nomail
calculate_nodhcp
calculate_noftp
calculate_nojabber
calculate_nonamed
calculate_nosamba
calculate_noproxy"
DEPEND="=sys-apps/calculate-lib-2.1.12-r7
dev-python/setuptools-python2
>=net-nds/openldap-2.3[-minimal]
>=sys-auth/pam_ldap-180[ssl]
>=sys-auth/nss_ldap-239
!<sys-apps/calculate-utils-3.5.0_alpha44
!calculate_nosamba? (
|| (
<net-fs/samba-4[acl,client,cups,ldap,netapi,pam,server,smbclient]
>=net-fs/samba-4[acl,client,cups,ldap,pam]
)
)
!calculate_nomail? (
|| ( <net-mail/dovecot-1.2.0[pop3d,ldap,pam,ssl]
>=net-mail/dovecot-1.2.0[ldap,pam,ssl(+)]
)
>=mail-filter/procmail-3.22
dev-python/pymilter-python2
>=mail-mta/postfix-2.2[ldap,pam,ssl,sasl,dovecot-sasl]
)
!calculate_noftp? (
|| ( <net-ftp/proftpd-1.3.3[-acl,ldap,ncurses,nls,pam,ssl,tcpd]
>=net-ftp/proftpd-1.3.3[-acl,ident,ldap,ncurses,nls,pam,ssl,tcpd]
)
)
!calculate_nojabber? (
|| ( >=net-im/ejabberd-2.1.8[mod_pubsub,ldap]
>=net-im/ejabberd-16.04-r1[ldap] )
|| ( media-gfx/imagemagick
media-gfx/graphicsmagick )
)
!calculate_nonamed? ( >=net-dns/bind-9.6.1_p1[sdb-ldap] )
!calculate_noproxy? ( >=net-proxy/squid-3.0.14[ldap,pam,ssl] )
!calculate_nodhcp? ( >=net-misc/dhcp-3.1.2_p1 )"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/calculate-server-2.1.20-remove_profile_pack.patch
)
pkg_postinst() {
if [ -d /var/calculate/server-data/mail/imap ] || \
[ -d /var/calculate/server-data/samba/win/profiles ] || \
[ -d /var/calculate/server-data/samba/unix/profiles ] || \
[ -d /var/calculate/server-data/samba/win/netlogon ];
then
ewarn "Data found in directories of previous version calculate-server"
fi
if [ -d /var/calculate/server-data/mail/imap ];
then
if ! [ -d /var/calculate/server-data/mail~ ];
then
if mv /var/calculate/server-data/mail/imap \
/var/calculate/server-data/mail~ && \
rmdir /var/calculate/server-data/mail && \
mv /var/calculate/server-data/mail~ \
/var/calculate/server-data/mail;
then
ewarn
ewarn "Data from /var/calculate/server-data/mail/imap"
ewarn "was moved to /var/calculate/server-data/mail"
MAILUPDATE="TRUE"
fi
fi
if ! [ "${MAILUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/mail/imap"
eerror "Please manualy move /var/calculate/server-data/mail/imap"
eerror "to /var/calculate/server-data/mail"
fi
fi
if [ -d /var/calculate/server-data/samba/win/profiles ];
then
SAMBAUPDATE=""
if ! [ -d /var/calculate/server-data/samba/profiles/win ];
then
if mkdir -p /var/calculate/server-data/samba/profiles && \
mv /var/calculate/server-data/samba/win/profiles \
/var/calculate/server-data/samba/profiles/win;
then
ewarn
ewarn "Data from /var/calculate/server-data/samba/win/profiles"
ewarn "was moved to /var/calculate/server-data/samba/profiles/win"
SAMBAUPDATE="TRUE"
fi
fi
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/samba/win/profiles"
eerror "Please manualy move "
eerror "/var/calculate/server-data/samba/win/profiles"
eerror "to /var/calculate/server-data/samba/profiles/win"
fi
fi
if [ -d /var/calculate/server-data/samba/unix/profiles ]; \
then
SAMBAUPDATE=""
if ! [ -d /var/calculate/server-data/samba/profiles/unix ];
then
if mkdir -p /var/calculate/server-data/samba/profiles && \
mv -f /var/calculate/server-data/samba/unix/profiles \
/var/calculate/server-data/samba/profiles/unix;
then
rmdir /var/calculate/server-data/samba/unix
ewarn
ewarn "Data from /var/calculate/server-data/samba/unix/profiles"
ewarn "was moved to /var/calculate/server-data/samba/profiles/unix"
SAMBAUPDATE="TRUE"
fi
fi
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/samba/unix/profiles"
eerror "Please manualy move "
eerror "/var/calculate/server-data/samba/unix/profiles"
eerror "to /var/calculate/server-data/samba/profiles/unix"
fi
fi
if [ -d /var/calculate/server-data/samba/win/netlogon ];
then
SAMBAUPDATE=""
if ! [ -d /var/calculate/server-data/samba/netlogon ];
then
if mv -f /var/calculate/server-data/samba/win/netlogon \
/var/calculate/server-data/samba/netlogon;
then
rmdir /var/calculate/server-data/samba/win
ewarn
ewarn "Data form /var/calculate/server-data/samba/win/netlogon"
ewarn "was moved to /var/calculate/server-data/samba/netlogon"
SAMBAUPDATE="TRUE"
fi
fi
if ! [ "${SAMBAUPDATE}" == "TRUE" ];
then
eerror "Cannot move /var/calculate/server-data/samba/win/netlogon"
eerror "Please manualy move "
eerror "/var/calculate/server-data/samba/win/netlogon"
eerror "/var/calculate/server-data/samba/netlogon"
fi
fi
if [ "${MAILUPDATE}" == "TRUE" ];
then
ewarn
ewarn "Please update mail service by the command:"
ewarn "\tcl-update mail"
fi
if [ "${SAMBAUPDATE}" == "TRUE" ];
then
ewarn
ewarn "Please update samba service by the command:"
ewarn "\tcl-update samba"
fi
ewarn
ewarn "WARNING!!! If you have the samba service, then update it by the command:"
ewarn "\tcl-update samba"
}

78
sys-apps/calculate-server/files/calculate-server-2.1.20-remove_profile_pack.patch
Unescape View File

@ -0,0 +1,78 @@
commit e2f3486d0fdfed28c4c7ccf71710519d33fa4d40
Author: Хирецкий Михаил <mh@calculate.ru>
Date: Mon Mar 15 15:53:33 2021 +0300
Удалена логика запаковки профиля при репликации
diff --git a/pym/cl_ldap.py b/pym/cl_ldap.py
index c4145ea..870d4d2 100644
--- a/pym/cl_ldap.py
+++ b/pym/cl_ldap.py
@@ -13120,11 +13120,6 @@ remove user %s in the LDAP branch 'Worked'")%str(userName))
# пользователя
sectionPwd = ["command","passwd_samba"]
varsPwdDict = txtConfig.getAreaVars(sectionPwd)
- # Если включена репликация
- if flagRepl:
- # Команда для упаковки профиля
- sectionPack = ["command","pack"]
- varsPackDict = txtConfig.getAreaVars(sectionPack)
error = txtConfig.getError()
if error:
printErrMessages(error)
@@ -13155,21 +13150,6 @@ remove user %s in the LDAP branch 'Worked'")%str(userName))
if set(varsPwdDict.keys()) == set(["date",
"status"]):
supportSections.append(",".join(sectionPwd))
- # Упаковка профиля пользователя
- if flagRepl and varsPackDict:
- # Если run=on выполняем команду
- if varsPackDict.get("run") == "on":
- # Дата новее которой файлы помещаются в архив
- strArchDate = varsPackDict.get("arch_date")
- # Текущее время на клинтском компьютере
- strCurrentTime = varsPackDict.get("curr_time")
- if strArchDate and strCurrentTime:
- # Создаем инкрементный архив
- if not self.packUserProfile(dirLogOut,
- strArchDate,
- strCurrentTime,
- txtConfig):
- return False
# Удаление секций которые не можем отработать
# и секции для создания архива профиля пользователя
sections = txtConfig.getAllSectionNames()
@@ -13503,11 +13483,6 @@ remove user %s in the LDAP branch 'Worked'")%str(userName))
# пользователя
sectionPwd = ["command","passwd_samba"]
varsPwdDict = txtConfig.getAreaVars(sectionPwd)
- # Если включена репликация
- if flagRepl:
- # Команда для упаковки профиля
- sectionPack = ["command","pack"]
- varsPackDict = txtConfig.getAreaVars(sectionPack)
error = txtConfig.getError()
if error:
printErrMessages(error)
@@ -13538,21 +13513,6 @@ remove user %s in the LDAP branch 'Worked'")%str(userName))
if set(varsPwdDict.keys()) == set(["date",
"status"]):
supportSections.append(",".join(sectionPwd))
- # Упаковка профиля пользователя
- if flagRepl and varsPackDict:
- # Если run=on выполняем команду
- if varsPackDict.get("run") == "on":
- # Дата новее которой файлы помещаются в архив
- strArchDate = varsPackDict.get("arch_date")
- # Текущее время на клинтском компьютере
- strCurrentTime = varsPackDict.get("curr_time")
- if strArchDate and strCurrentTime:
- # Создаем инкрементный архив
- if not self.packUserProfile(dirLogOut,
- strArchDate,
- strCurrentTime,
- txtConfig):
- return False
# Удаление секций которые не можем отработать
# и секции для создания архива профиля пользователя
sections = txtConfig.getAllSectionNames()
Write Preview
Loading…
Cancel
Save