Compare commits

...

6 Commits

Author SHA1 Message Date
Robert Förster (Dessa) 43a428de63 switch metadatas to https, revert profile eapi (no change, really) bump froxlor ebuild to eapi8 2022-03-20 02:28:10 +01:00
Robert Förster (Dessa) 3ad232f3c9 Merge branch 'master' of github.com:Froxlor/Gentoo-Ebuild 2022-03-20 02:15:13 +01:00
Michael Kaufmann (d00p) 91bb30381e update ebuild to current stable version 0.10.33
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2022-02-10 07:19:04 +00:00
Michael Kaufmann (d00p) cdb5f8c222 update ebuild to reflect current version and changes; fixes #1
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
2022-01-10 09:54:06 +00:00
Robert Förster (Dessa) 9aa37d8633 [profiles] cleanup 2021-09-26 15:23:22 +02:00
Robert Förster (Dessa) 836df568fe [sys-auth/libnss-extrausers] bump eapi 2021-09-26 15:22:12 +02:00
11 changed files with 117 additions and 114 deletions

View File

@ -1,11 +1,11 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# For details on this file, see the layout.conf section of the
# portage(5) man page.
# Allow specific PROPERTIES and RESTRICT values in ebuilds.
properties-allowed = interactive live
properties-allowed = interactive live test_network
restrict-allowed = binchecks bindist fetch installsources mirror preserve-libs splitdebug strip test userpriv
# manifest-hashes specify hashes used for new/updated entries
@ -25,8 +25,14 @@ manifest-required-hashes = BLAKE2B
# 2016-01-10 council meeting banned EAPIs 0 and 3.
# 2018-04-08 council meeting banned EAPI 4.
# 2018-05-13 council meeting deprecated EAPI 5 for ebuilds.
# 2021-07-11 council meeting deprecated EAPI 6.
eapis-banned = 0 1 2 3 4
eapis-deprecated = 5
eapis-deprecated = 5 6
# EAPIs 0 to 4 are banned for profiles
# EAPIs 6 and 7 do not include any profile related changes
profile-eapis-banned = 0 1 2 3 4 6 7
profile-eapis-deprecated =
# Bug #337853 - gentoo's council says to enable
# --echangelog by default for the "gentoo" repo

View File

@ -1,4 +1,3 @@
# Froxlor Release Team <release@froxlor.org> (30 Jan 2010)
# Live version, only use that when you know what you are doing.
=www-apps/froxlor-0.9.9999
=www-apps/froxlor-9999

View File

@ -16,5 +16,4 @@ www-apps/froxlor:nginx - use nginx instead of Apache
www-apps/froxlor:pdns - use Power-DNS instead of Bind
www-apps/froxlor:pureftpd - use pure-FTPd instead of ProFTPd
www-apps/froxlor:quota - Adds support for Filesystem-Quotas
www-apps/froxlor:tickets - Adds support for the Ticket System
www-apps/froxlor:vsftpd - use vsFTPd instead of ProFTPd

View File

@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
DESCRIPTION="nss module to have an additional passwd, shadow and group file"
HOMEPAGE="https://sources.debian.org/src/libnss-extrausers/0.6-4/"

View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>release@froxlor.org</email>
<description>Upstream Provider</description>
</maintainer>
<longdescription>nss module to have an additional passwd, shadow and group file.</longdescription>
</pkgmetadata>

44
sys-auth/metadata.xml Normal file
View File

@ -0,0 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The sys-auth category contains applications and libraries to support
authentication and authorization facilities.
Here belongs PAM modules, NSS modules and login apps.
</longdescription>
<longdescription lang="ja">
sys-authカテゴリには確認を採用するアプリケーションとライブラリが
含まれます。これはPAMとNSSモジュールとログインアプリケーションの場所です。
</longdescription>
<longdescription lang="vi">
Nhóm sys-auth chứa các ứng dụng và thư viện hỗ trợ xác thực và phân quyền.
Ở đây bao gồm các module PAM, NSS và các ứng dụng đăng nhập.
</longdescription>
<longdescription lang="de">
Die Kategorie sys-auth enthält Programme und Bibliotheken die Funktionen
zur Authentifizierung und Authorisierung zur Verfügung stellen. Module für PAM
und NSS sowie Loginapplikationen finden sich hier.
</longdescription>
<longdescription lang="it">
La categoria sys-auth contiene applicazioni e librerie di supporto per
gli strumenti di autenticazione e autorizzazione. Appartengono a questa categoria
i moduli PAM, i moduli NSS e le applicazioni di login.
</longdescription>
<longdescription lang="pt">
A categoria sys-auth contém aplicações e bibliotecas para
suportar instrumentos de autenticação e autorização.
Nesta categoria pertencem módulos de PAM, módulos de NSS e
aplicações de login.
</longdescription>
<longdescription lang="pl">
Kategoria sys-auth zawiera biblioteki oraz programy związane z
autoryzacją i uwierzytelnianiem. Znajdują się tu moduły PAM, NSS oraz
aplikacje służące do logowania.
</longdescription>
<longdescription lang="es">
La categoría sys-auth contiene aplicaciones y librerías para dar
soporte a los servicios de autenticación y autorización.
A esta categoría pertenecen los módulos PAM, NSS y las aplicaciones
para ingresar en el sistema.
</longdescription>
</catmetadata>

View File

@ -1 +1 @@
DIST froxlor-0.10.25.tar.gz 2516439 BLAKE2B 4b822fbccca3a5d7672b07f39f3229068ff13507457c92c23aedf7685787146f2b447c1e87207492bf9952168dfd9246d9e08b27991385df7390dae561042428 SHA512 8e6759c98af01d76e3f023b364f83dd013296eadb60c2b2d97a1a528e1b29c762d4e74f4a3b0081e2a4f6989003db3e9a63acc24ba8d3961e173f269362169d3
DIST froxlor-0.10.33.tar.gz 2578273 BLAKE2B ae58fdf4061a5aa234a57767b2ebc52a1dfc5dd5caffbd18d7e2136c06f8900451f7d9b9f2f7f81fd8ed2b8f996f08510204a53ca8976031c2f2b5b56c4071ed SHA512 801a02b4b1e70eb05180468707b1b01c6571459067b8ddbb4ceaf3f587b38331649f7d82ed0941355b8b7cddb8dc56ed11fda37c719ab476e7309c8d49ba8abe

View File

@ -1,4 +1,4 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
@ -19,25 +19,19 @@ HOMEPAGE="https://www.froxlor.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="awstats bind domainkey +dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pdns pureftpd quota ssl vsftpd"
IUSE="awstats bind +dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pdns pureftpd quota ssl"
DEPEND="
virtual/mysql
>=mail-mta/postfix-2.4[mysql,ssl=]
virtual/cron
>=dev-lang/php-7.1:*[bcmath,cli,ctype,curl,filter,gd,json,mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib,zip]
>=dev-lang/php-7.1:*[bcmath,cli,ctype,curl,filter,gd,json(+),mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib,zip]
pureftpd? (
net-ftp/pure-ftpd[mysql,ssl=]
)
vsftpd? (
net-ftp/vsftpd[pam,ssl=]
sys-auth/pam_mysql
)
!pureftpd? (
( !vsftpd? (
net-ftp/proftpd[mysql,ssl=]
ftpquota? ( net-ftp/proftpd[softquota] )
)
)
net-ftp/proftpd[mysql,ssl=]
ftpquota? ( net-ftp/proftpd[softquota] )
)
awstats? (
www-misc/awstats
@ -45,12 +39,8 @@ DEPEND="
!awstats? (
app-admin/webalizer
)
bind? ( net-dns/bind
domainkey? ( mail-filter/opendkim[ssl=] )
)
pdns? ( net-dns/pdns[mysql]
domainkey? ( mail-filter/opendkim[ssl=] )
)
bind? ( net-dns/bind )
pdns? ( net-dns/pdns[mysql] )
ssl? ( dev-libs/openssl )
lighttpd? ( www-servers/lighttpd[php,ssl=] )
nginx? (
@ -93,19 +83,18 @@ DEPEND="
>=mail-mta/postfix-2.4[dovecot-sasl]
)
!dovecot? ( dev-libs/cyrus-sasl[mysql,ssl=]
net-libs/courier-authlib[crypt,mysql]
net-libs/courier-authlib[mysql]
net-mail/courier-imap
>=mail-mta/postfix-2.4[sasl]
)
mailquota? ( >=mail-mta/postfix-2.4[vda] )
quota? ( sys-fs/quotatool )"
RDEPEND="${DEPEND}"
REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm ) vsftpd? ( !ftpquota ) pdns? ( !bind )"
REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm ) pdns? ( !bind )"
# we need that to set the standardlanguage later
LANGS="de en fr it nl pt sv"
LANGS="cs de en fr it nl pt sv"
for X in ${LANGS} ; do
IUSE="${IUSE} l10n_${X}"
done
@ -138,13 +127,15 @@ src_install() {
elif use l10n_fr ; then
MYLANG="Fran&ccedil;ais"
elif use l10n_it ; then
MYLANG="Italian"
MYLANG="Italiano"
elif use l10n_nl ; then
MYLANG="Dutch"
MYLANG="Nederlands"
elif use l10n_pt ; then
MYLANG="Portugu&ecirc;s"
elif use l10n_sv ; then
MYLANG="Swedish"
MYLANG="Svenska"
elif use l10n_cs ; then
MYLANG="&#268;esk&aacute; republika"
fi
if [[ ${MYLANG} != '' ]] ; then
@ -160,8 +151,8 @@ src_install() {
einfo "Switching settings to fit 'lighttpd'"
sed -e "s|/etc/init.d/apache2 reload|/etc/init.d/lighttpd restart|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver restart-command"
sed -e "s|'webserver', 'apache2'|'webserver', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver version"
sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/lighttpd/froxlor-vhosts.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_diroptions', '/etc/apache2/diroptions.conf'|'apacheconf_diroptions', '/etc/lighttpd/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file"
sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/lighttpd/vj/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/lighttpd/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file"
sed -e "s|'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'|'apacheconf_htpasswddir', '/etc/lighttpd/htpasswd/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver htpasswd directory"
sed -e "s|'httpuser', 'www-data'|'httpuser', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user"
sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group"
@ -170,15 +161,16 @@ src_install() {
einfo "Switching settings to fit 'nginx'"
sed -e "s|/etc/init.d/apache2 reload|/etc/init.d/nginx restart|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver restart-command"
sed -e "s|'webserver', 'apache2'|'webserver', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver version"
sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/nginx/froxlor-vhosts.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_diroptions', '/etc/apache2/diroptions.conf'|'apacheconf_diroptions', '/etc/nginx/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file"
sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/nginx/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/nginx/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file"
sed -e "s|'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'|'apacheconf_htpasswddir', '/etc/nginx/htpasswd/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver htpasswd directory"
sed -e "s|'httpuser', 'www-data'|'httpuser', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user"
sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group"
sed -e "s|'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'|'fastcgi_ipcdir', '/var/run/nginx/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change php-ipc directory"
else
einfo "Switching settings to fit 'apache2'"
sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file"
sed -e "s|'httpuser', 'www-data'|'httpuser', 'apache'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user"
sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'apache'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group"
fi
@ -195,17 +187,9 @@ src_install() {
einfo "Switching 'fpm' to 'On'"
sed -e "s|'phpfpm', 'enabled', '0'|'phpfpm', 'enabled', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set fpm to 'On'"
einfo "Setting configdir for fpm"
sed -e "s|'phpfpm', 'configdir', '/etc/php-fpm.d/'|'phpfpm', 'configdir', '/etc/php/fpm-php5.3/fpm.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set configdir for 'fpm'"
# ewarn "tell here what to do for including fpm.d/*.conf"
# einfo "Enable custom configdir for fpm"
# sed -e "s|;include=/etc/php/fpm-php5.3/fpm.d/*.conf|include=/etc/php/fpm-php5.3/fpm.d/*.conf|g" -i "/etc/php/fpm-php5.3/php-fpm.conf" || die "Unable to set custom configdir for 'fpm'"
# einfo "Checking for directory /etc/php/fpm-php5.3/fpm.d/"
# if [ ! -d /etc/php/fpm-php5.3/fpm.d/ ]; then
# dodir "/etc/php/fpm-php5.3/fpm.d/"
# fi
# how to get version of required/installed php package?
# einfo "Setting configdir for fpm"
# sed -e "s|'phpfpm', 'configdir', '/etc/php-fpm.d/'|'phpfpm', 'configdir', '/etc/php/fpm-php5.3/fpm.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set configdir for 'fpm'"
fi
@ -245,15 +229,6 @@ src_install() {
sed -e "s|'mail_quota_enabled', '0'|'mail_quota_enabled', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set mailquota to 'On'"
fi
# default value is dkim_enabled='0'
if use domainkey && use bind ; then
einfo "Switching 'domainkey' to 'On'"
sed -e "s|'use_dkim', '0'|'use_dkim', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set domainkey to 'On'"
einfo "Setting dkim-path to gentoo value"
sed -e "s|'dkim_prefix', '/etc/postfix/dkim/'|'dkim_prefix', '/etc/mail/dkim-filter/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set domainkey prefix"
fi
# default value is ssl_enabled='1'
if ! use ssl ; then
einfo "Switching 'SSL' to 'Off'"

View File

@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
EAPI="8"
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/Froxlor/Froxlor.git"
@ -19,25 +19,19 @@ HOMEPAGE="https://www.froxlor.org/"
LICENSE="GPL-2"
SLOT="0"
IUSE="awstats bind domainkey +dovecot fcgid ftpquota fpm lighttpd +log mailquota nginx pdns pureftpd quota ssl vsftpd"
IUSE="awstats bind +dovecot fcgid fpm ftpquota lighttpd +log mailquota nginx pdns pureftpd quota ssl"
DEPEND="
virtual/mysql
>=mail-mta/postfix-2.4[mysql,ssl=]
virtual/cron
>=dev-lang/php-7.1:*[bcmath,cli,ctype,curl,filter,gd,json,mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib,zip]
>=dev-lang/php-7.1:*[bcmath,cli,ctype,curl,filter,gd,json(+),mysql,nls,pcntl,pdo,posix,session,simplexml,ssl=,tokenizer,unicode,xml,xslt,zlib,zip]
pureftpd? (
net-ftp/pure-ftpd[mysql,ssl=]
)
vsftpd? (
net-ftp/vsftpd[pam,ssl=]
sys-auth/pam_mysql
)
!pureftpd? (
( !vsftpd? (
net-ftp/proftpd[mysql,ssl=]
ftpquota? ( net-ftp/proftpd[softquota] )
)
)
net-ftp/proftpd[mysql,ssl=]
ftpquota? ( net-ftp/proftpd[softquota] )
)
awstats? (
www-misc/awstats
@ -45,12 +39,8 @@ DEPEND="
!awstats? (
app-admin/webalizer
)
bind? ( net-dns/bind
domainkey? ( mail-filter/opendkim[ssl=] )
)
pdns? ( net-dns/pdns[mysql]
domainkey? ( mail-filter/opendkim[ssl=] )
)
bind? ( net-dns/bind )
pdns? ( net-dns/pdns[mysql] )
ssl? ( dev-libs/openssl )
lighttpd? ( www-servers/lighttpd[php,ssl=] )
nginx? (
@ -93,19 +83,18 @@ DEPEND="
>=mail-mta/postfix-2.4[dovecot-sasl]
)
!dovecot? ( dev-libs/cyrus-sasl[mysql,ssl=]
net-libs/courier-authlib[crypt,mysql]
net-libs/courier-authlib[mysql]
net-mail/courier-imap
>=mail-mta/postfix-2.4[sasl]
)
mailquota? ( >=mail-mta/postfix-2.4[vda] )
quota? ( sys-fs/quotatool )"
RDEPEND="${DEPEND}"
REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm ) vsftpd? ( !ftpquota ) pdns? ( !bind )"
REQUIRED_USE="lighttpd? ( !nginx ) fcgid? ( !fpm ) pdns? ( !bind )"
# we need that to set the standardlanguage later
LANGS="de en fr it nl pt sv"
LANGS="cs de en fr it nl pt sv"
for X in ${LANGS} ; do
IUSE="${IUSE} l10n_${X}"
done
@ -138,13 +127,15 @@ src_install() {
elif use l10n_fr ; then
MYLANG="Fran&ccedil;ais"
elif use l10n_it ; then
MYLANG="Italian"
MYLANG="Italiano"
elif use l10n_nl ; then
MYLANG="Dutch"
MYLANG="Nederlands"
elif use l10n_pt ; then
MYLANG="Portugu&ecirc;s"
elif use l10n_sv ; then
MYLANG="Swedish"
MYLANG="Svenska"
elif use l10n_cs ; then
MYLANG="&#268;esk&aacute; republika"
fi
if [[ ${MYLANG} != '' ]] ; then
@ -160,8 +151,8 @@ src_install() {
einfo "Switching settings to fit 'lighttpd'"
sed -e "s|/etc/init.d/apache2 reload|/etc/init.d/lighttpd restart|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver restart-command"
sed -e "s|'webserver', 'apache2'|'webserver', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver version"
sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/lighttpd/froxlor-vhosts.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_diroptions', '/etc/apache2/diroptions.conf'|'apacheconf_diroptions', '/etc/lighttpd/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file"
sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/lighttpd/vj/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/lighttpd/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file"
sed -e "s|'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'|'apacheconf_htpasswddir', '/etc/lighttpd/htpasswd/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver htpasswd directory"
sed -e "s|'httpuser', 'www-data'|'httpuser', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user"
sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'lighttpd'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group"
@ -170,15 +161,16 @@ src_install() {
einfo "Switching settings to fit 'nginx'"
sed -e "s|/etc/init.d/apache2 reload|/etc/init.d/nginx restart|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver restart-command"
sed -e "s|'webserver', 'apache2'|'webserver', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver version"
sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/nginx/froxlor-vhosts.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_diroptions', '/etc/apache2/diroptions.conf'|'apacheconf_diroptions', '/etc/nginx/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file"
sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/nginx/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/nginx/diroptions.conf'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file"
sed -e "s|'apacheconf_htpasswddir', '/etc/apache2/htpasswd/'|'apacheconf_htpasswddir', '/etc/nginx/htpasswd/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver htpasswd directory"
sed -e "s|'httpuser', 'www-data'|'httpuser', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user"
sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'nginx'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group"
sed -e "s|'fastcgi_ipcdir', '/var/lib/apache2/fastcgi/'|'fastcgi_ipcdir', '/var/run/nginx/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change php-ipc directory"
else
einfo "Switching settings to fit 'apache2'"
sed -e "s|'apacheconf_vhost', '/etc/apache2/vhosts.conf'|'apacheconf_vhost', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_vhost', '/etc/apache2/sites-enabled/'|'apacheconf_vhost', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver vhost directory"
sed -e "s|'apacheconf_diroptions', '/etc/apache2/sites-enabled/'|'apacheconf_diroptions', '/etc/apache2/vhosts.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver diroptions file"
sed -e "s|'httpuser', 'www-data'|'httpuser', 'apache'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver user"
sed -e "s|'httpgroup', 'www-data'|'httpgroup', 'apache'|g" -i "${S}/install/froxlor.sql" || die "Unable to change webserver group"
fi
@ -195,17 +187,9 @@ src_install() {
einfo "Switching 'fpm' to 'On'"
sed -e "s|'phpfpm', 'enabled', '0'|'phpfpm', 'enabled', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set fpm to 'On'"
einfo "Setting configdir for fpm"
sed -e "s|'phpfpm', 'configdir', '/etc/php-fpm.d/'|'phpfpm', 'configdir', '/etc/php/fpm-php5.3/fpm.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set configdir for 'fpm'"
# ewarn "tell here what to do for including fpm.d/*.conf"
# einfo "Enable custom configdir for fpm"
# sed -e "s|;include=/etc/php/fpm-php5.3/fpm.d/*.conf|include=/etc/php/fpm-php5.3/fpm.d/*.conf|g" -i "/etc/php/fpm-php5.3/php-fpm.conf" || die "Unable to set custom configdir for 'fpm'"
# einfo "Checking for directory /etc/php/fpm-php5.3/fpm.d/"
# if [ ! -d /etc/php/fpm-php5.3/fpm.d/ ]; then
# dodir "/etc/php/fpm-php5.3/fpm.d/"
# fi
# how to get version of required/installed php package?
# einfo "Setting configdir for fpm"
# sed -e "s|'phpfpm', 'configdir', '/etc/php-fpm.d/'|'phpfpm', 'configdir', '/etc/php/fpm-php5.3/fpm.d/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set configdir for 'fpm'"
fi
@ -245,15 +229,6 @@ src_install() {
sed -e "s|'mail_quota_enabled', '0'|'mail_quota_enabled', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set mailquota to 'On'"
fi
# default value is dkim_enabled='0'
if use domainkey && use bind ; then
einfo "Switching 'domainkey' to 'On'"
sed -e "s|'use_dkim', '0'|'use_dkim', '1'|g" -i "${S}/install/froxlor.sql" || die "Unable to set domainkey to 'On'"
einfo "Setting dkim-path to gentoo value"
sed -e "s|'dkim_prefix', '/etc/postfix/dkim/'|'dkim_prefix', '/etc/mail/dkim-filter/'|g" -i "${S}/install/froxlor.sql" || die "Unable to set domainkey prefix"
fi
# default value is ssl_enabled='1'
if ! use ssl ; then
einfo "Switching 'SSL' to 'Off'"

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>release@froxlor.org</email>
@ -9,8 +9,6 @@
<use>
<flag name='awstats'>use AWStats instead of Webalizer</flag>
<flag name='bind'>Adds support for writing BIND configuration files</flag>
<flag name='domainkey'>Adds support for writing DKIM DNS-Records and
Filters for them</flag>
<flag name='dovecot'>use Dovecot instead of Courier</flag>
<flag name='fcgid'>Adds support for FCGId</flag>
<flag name='ftpquota'>Adds support for FTP Quotas for use with ProFTPd</flag>
@ -23,7 +21,6 @@
<flag name='pdns'>use Power-DNS instead of Bind</flag>
<flag name='pureftpd'>use pure-FTPd instead of ProFTPd</flag>
<flag name='quota'>Adds support for Filesystem-Quotas</flag>
<flag name='vsftpd'>use vsFTPd instead of ProFTPd</flag>
</use>
<upstream>
<remote-id type="cpe">cpe:/a:froxlor:froxlor</remote-id>

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<catmetadata>
<longdescription lang="en">
The www-apps category contains various world wide web applications.
@ -38,4 +38,3 @@
Kategoria www-apps zawiera programy związane z przeglądaniem WWW.
</longdescription>
</catmetadata>