From 23c7d247f3cc12c5f58b10cfe258b2be3d5a5fe7 Mon Sep 17 00:00:00 2001 From: Benedikt Boehm Date: Wed, 20 Feb 2008 16:12:34 +0000 Subject: [PATCH] merge from webapp overlay wrt #172138; cleanup wrt #208584 Package-Manager: portage-2.1.4.4 --- www-apps/postfixadmin/ChangeLog | 14 ++- www-apps/postfixadmin/Manifest | 13 +-- .../files/postinstall-en-mysql.txt | 45 ++++++++++ .../files/postinstall-en-postgres.txt | 25 ++++++ www-apps/postfixadmin/metadata.xml | 12 +-- .../postfixadmin/postfixadmin-2.1.0-r1.ebuild | 89 +++++++++++++++++++ 6 files changed, 186 insertions(+), 12 deletions(-) create mode 100644 www-apps/postfixadmin/files/postinstall-en-mysql.txt create mode 100644 www-apps/postfixadmin/files/postinstall-en-postgres.txt create mode 100644 www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild diff --git a/www-apps/postfixadmin/ChangeLog b/www-apps/postfixadmin/ChangeLog index 08e6e13213ce..d74befcceba9 100644 --- a/www-apps/postfixadmin/ChangeLog +++ b/www-apps/postfixadmin/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for www-apps/postfixadmin # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.9 2008/02/05 15:10:24 hollow Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/ChangeLog,v 1.10 2008/02/20 16:12:33 hollow Exp $ + +*postfixadmin-2.1.0-r1 (20 Feb 2008) + + 20 Feb 2008; Benedikt Böhm + +files/postinstall-en-mysql.txt, +files/postinstall-en-postgres.txt, + metadata.xml, +postfixadmin-2.1.0-r1.ebuild: + merge from webapp overlay wrt #172138; cleanup wrt #208584 + + 05 Feb 2008; Jakub Moc + postfixadmin-2.1.0-r1.ebuild: + Add postgres support. Nuke nonsensical RDEPEND on grep, sed and findutils, + fix enewuser/enewgroup usage. Quoting, clean up tons of redundant comments. 05 Feb 2008; Benedikt Böhm postfixadmin-2.1.0.ebuild: fix depend.apache usage wrt #208584 diff --git a/www-apps/postfixadmin/Manifest b/www-apps/postfixadmin/Manifest index d0a8d1a0dd12..5b3b5e3544d9 100644 --- a/www-apps/postfixadmin/Manifest +++ b/www-apps/postfixadmin/Manifest @@ -2,15 +2,18 @@ Hash: SHA1 AUX config-hook.sh 202 RMD160 5330c8319a0b4b1d89ceee9eb3d7adac0a046034 SHA1 84efe994c7c82b4ed16f9b1b6b51e09c26fd95d4 SHA256 a80dc6ea1f7144391e76029d857c2cf5f0554c4feb49613af6ed09ba2c84c565 +AUX postinstall-en-mysql.txt 1860 RMD160 d101b8d7e2738214d9fa8f2ddef56121e0c55436 SHA1 e90f7f2c1ef03c0df2d0e70633363b82d776178b SHA256 2238c4c180a9ef4781e43d29b14dfc41ef36cc58aba0aa4c3246c89fd7563cc0 +AUX postinstall-en-postgres.txt 1106 RMD160 ccb4f43bff30226aae04ad64fa342cc33c5d09f0 SHA1 78cbf29d8195de93fc6ac4c4c84f1e7eef429f4c SHA256 fde63c8cf8510cf66593c7e0cf8e75afc73f010333baa79d8ebcb27abcf85442 AUX postinstall-en.txt 1859 RMD160 8ba29b5fae66503e38b822fe0f483a688935b6a3 SHA1 214df1f8404bcdfc97712798d4d8e60569512861 SHA256 a8d58a82e734ce28acf3cc5730805c7db7ebb54cbb6eeff67dd379cb8a6f234e DIST postfixadmin-2.1.0.tgz 160525 RMD160 a90773bcfd9caa0a197fb11a39ac1350a053ebc2 SHA1 9c87962a543df7639a547a021d192998e5c96ca2 SHA256 8c34f17b91c1f82923b8fc3f0fb73716e853f874b2015998a975bd9909029a44 +EBUILD postfixadmin-2.1.0-r1.ebuild 2385 RMD160 86c04617e944a42b9cbad29bb2871fda4f7257a4 SHA1 65f4bffe78ba0759958beaf71f38c83a5d135e83 SHA256 8f321ff915eb99a0e55d3054b08fb0affdb168b562fbb953b8458f551ed3e3a7 EBUILD postfixadmin-2.1.0.ebuild 3515 RMD160 0327f8823a41777c380a8d9a08fa127f5b2cda60 SHA1 9c2bb1aa32ef3072a974b51a844fb009bb68d62c SHA256 7754d8912740f7dc81b9339c52d83111a197c059b518cd9e22c4ca01d4a5d93d -MISC ChangeLog 1988 RMD160 80758a8db8179d9440a0bbfea6aa1eb4b18054f1 SHA1 81e7b68ead768bab85ff246be38aa95596ea2e88 SHA256 ba319f495e417c30ea366279fecfb84b5238f0241584219b231a3df9e75b57cb -MISC metadata.xml 300 RMD160 bf586296c9109dde24954321b649d4209515a655 SHA1 4d51a604920a4063599ce594e66c89bade642e2b SHA256 ede26e0fd846cfff8f6fbe5207a5f62606d3fdd8b7dd36fbc7eca81f5059c9e9 +MISC ChangeLog 2489 RMD160 aaa14bee97210d0cf06cc54c6c3707ac16297cbf SHA1 0f2805dd20a987d02046596c3eedf94b5c682ca4 SHA256 11878be4583e4547d5320092edfd38389fb20a1db615fb57ea980a2b5dc11637 +MISC metadata.xml 303 RMD160 ebd1637c44fbe83303cedc051b2da86937774776 SHA1 d440c537ebdb8cca8e35c904a5c990ec9a7685b2 SHA256 fb139c069b1a129f7588810b16df3f9047af8629443220b19ed664c1d939b1cb -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.8 (GNU/Linux) -iEYEARECAAYFAkeofGUACgkQmPFBzbX68WGU/wCfZb/2eWOUqKodojYl9Pzzuwkb -2MsAoJTbcw/cUWMGwasUaNwPfOxP6cFF -=P7pI +iEYEARECAAYFAke8UXoACgkQmPFBzbX68WH37wCgmMrWW8htc7qGlMJL8jNzuxJv +ad8An3f8hvE9xJS7AQIeLtYyt7z1dCWl +=DJJc -----END PGP SIGNATURE----- diff --git a/www-apps/postfixadmin/files/postinstall-en-mysql.txt b/www-apps/postfixadmin/files/postinstall-en-mysql.txt new file mode 100644 index 000000000000..c2a85aa696b9 --- /dev/null +++ b/www-apps/postfixadmin/files/postinstall-en-mysql.txt @@ -0,0 +1,45 @@ +To complete installation, you must: + 1. Create the needed MySQL database and tables and user: + mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql + 2. Reload MySQL: + /etc/init.d/mysql restart + 3. Change the password for the admin user! Inital password is + "admin" (without the quotes). + + +Updating from older version of Postfix Admin: + * When you are upgrading from an older Postfix Admin version, make sure you + * backup your database before you run the update script on your database. + * mysqldump -a -u root -p > /tmp/postfixadmin-backup.sql + + For update from 2.0.x version of Postfix Admin: + 1. Please read the BACKUP_MX.TXT + 2. Update the needed MySQL database and tables: + mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/2.0.x_to_${PVR}.sql + 3. Reload MySQL: + /etc/init.d/mysql restart + + For update from 1.5x (or older) version of Postfix Admin: + 1. Please read the UPGRADE.TXT + 2. Update the needed MySQL database and tables: + mysql -u root -p < ${MY_SQLSCRIPTSDIR}/mysql/1.5x_to_${PVR}.sql + 3. Reload MySQL: + /etc/init.d/mysql restart + + +To use Virtual Vacation, please read VIRTUAL_VACATION_INSTALL. + +Check the config.inc.php file. There you can specify settings that are +relevant to your setup. + +Postfix Admin contains 3 views of administration: + 1. Site Admin view, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/admin/. + 2. Domain Admin view, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/. + 3. User Admin View, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/users/. + +In order to do the initial configuration you have to go to the Site Admin view. + +The default password for the Site Admin view of Postfix Admin is admin/admin. + +This is specified in the .htpasswd file in the /admin directory. Make sure +that the location of the .htpasswd file matches your path. diff --git a/www-apps/postfixadmin/files/postinstall-en-postgres.txt b/www-apps/postfixadmin/files/postinstall-en-postgres.txt new file mode 100644 index 000000000000..66f303eff672 --- /dev/null +++ b/www-apps/postfixadmin/files/postinstall-en-postgres.txt @@ -0,0 +1,25 @@ +To complete installation, you must: + 1. Create the needed PostgreSQL database and tables and user: + creatuser -P postfix + creatuser -P postfixadmin + createdb -U postgres postfix + psql -U postgres -p < ${MY_SQLSCRIPTSDIR}/postgresql/${PVR}_create.sql + 2. Reload PostgreSQL: + /etc/init.d/postgresql restart + 3. Change the password for the admin user! Inital password is + "admin" (without the qotes). + +Check the config.inc.php file. There you can specify settings that are +relevant to your setup. + +Postfix Admin contains 3 views of administration: + 1. Site Admin view, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/admin/. + 2. Domain Admin view, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/. + 3. User Admin View, located at http://${VHOST_HOSTNAME}${VHOST_APPDIR}/users/. + +In order to do the initial configuration you have to go to the Site Admin view. + +The default password for the Site Admin view of Postfix Admin is admin/admin. + +This is specified in the .htpasswd file in the /admin directory. Make sure +that the location of the .htpasswd file matches your path. diff --git a/www-apps/postfixadmin/metadata.xml b/www-apps/postfixadmin/metadata.xml index 2dde2f793249..189c689fbc89 100644 --- a/www-apps/postfixadmin/metadata.xml +++ b/www-apps/postfixadmin/metadata.xml @@ -1,10 +1,10 @@ -web-apps - - wrobel@gentoo.org - Gunnar Wrobel - Primary maintainer - + web-apps + + wrobel@gentoo.org + Gunnar Wrobel + Primary maintainer + diff --git a/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild b/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild new file mode 100644 index 000000000000..69a222f6dfa9 --- /dev/null +++ b/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apps/postfixadmin/postfixadmin-2.1.0-r1.ebuild,v 1.1 2008/02/20 16:12:33 hollow Exp $ + +inherit eutils webapp depend.php confutils + +DESCRIPTION="Web Based Management tool for Postfix style virtual domains and users." +HOMEPAGE="http://high5.net/postfixadmin/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" + +LICENSE="MPL-1.1" +KEYWORDS="~amd64 ~x86" +IUSE="mysql postgres" + +DEPEND=">=mail-mta/postfix-2.0.0 + >=dev-lang/perl-5.0 + dev-perl/DBI + mysql? ( dev-perl/DBD-mysql ) + postgres? ( dev-perl/DBD-Pg )" +RDEPEND="${DEPEND}" + +need_php_httpd + +pkg_setup() { + webapp_pkg_setup + + confutils_require_any mysql postgres + confutils_use_depend_built_with_all mysql mail-mta/postfix mysql + confutils_use_depend_built_with_all postgres mail-mta/postfix postgres + + if use mysql; then + enewgroup vacation + enewuser vacation -1 -1 -1 vacation + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + ecvs_clean + + mv VIRTUAL_VACATION/INSTALL.TXT VIRTUAL_VACATION_INSTALL.TXT + + mv DATABASE_MYSQL.TXT "${T}"/mysql-setup.sql + mv TABLE_CHANGES.TXT "${T}"/mysql-update.sql + mv DATABASE_PGSQL.TXT "${T}"/postgres-setup.sql + + mv config.inc.php{.sample,} +} + +src_install() { + webapp_src_preinst + + # virtual vacation only works with MySQL + if use mysql; then + diropts -m0770 -o vacation -g vacation + dodir /var/spool/vacation + keepdir /var/spool/vacation + insinto /var/spool/vacation + insopts -m770 -o vacation -g vacation + doins "${S}"/VIRTUAL_VACATION/vacation.pl + fi + + local docs="BACKUP_MX.TXT CHANGELOG.TXT INSTALL.TXT LANGUAGE.TXT + TABLE_BACKUP_MX.TXT UPGRADE.TXT VIRTUAL_VACATION_INSTALL.TXT" + dodoc ${docs} + rm -rf ${docs} LICENSE.TXT ADDITIONS/ + + insinto "${MY_HTDOCSDIR}" + doins -r . + + if use mysql; then + webapp_sqlscript mysql "${T}"/mysql-setup.sql + webapp_sqlscript mysql "${T}"/mysql-update.sql 2.0.x + webapp_sqlscript mysql "${T}"/mysql-update.sql 1.5x + webapp_postinst_txt en "${FILESDIR}"/postinstall-en-mysql.txt + fi + if use postgres; then + webapp_sqlscript postgresql "${T}"/postgres-setup.sql + webapp_postinst_txt en "${FILESDIR}"/postinstall-en-postgres.txt + fi + + webapp_configfile "${MY_HTDOCSDIR}"/config.inc.php + webapp_configfile "${MY_HTDOCSDIR}"/admin/.htpasswd + + webapp_hook_script "${FILESDIR}"/config-hook.sh + + webapp_src_install +} -- 2.26.2