From f11eb1a1dade95e774bdfc82745c9948ae8c2462 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Sat, 13 Jan 2007 20:25:36 +0000 Subject: [PATCH] Cleanup. Package-Manager: portage-2.1.2_rc4-r8 --- net-www/mod_auth_mysql/ChangeLog | 7 +- .../files/12_mod_auth_mysql.conf | 129 ++++++++++++++++++ .../mod_auth_mysql-3.0.0-r1.ebuild | 10 +- .../mod_auth_mysql-3.0.0-r2.ebuild | 8 +- 4 files changed, 142 insertions(+), 12 deletions(-) create mode 100644 net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf diff --git a/net-www/mod_auth_mysql/ChangeLog b/net-www/mod_auth_mysql/ChangeLog index 482ec1bd5720..5fcee53f46cf 100644 --- a/net-www/mod_auth_mysql/ChangeLog +++ b/net-www/mod_auth_mysql/ChangeLog @@ -1,12 +1,17 @@ # ChangeLog for net-www/mod_auth_mysql # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/ChangeLog,v 1.25 2007/01/09 21:27:49 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/ChangeLog,v 1.26 2007/01/13 20:25:36 chtekk Exp $ 07 Dec 2006; Luca Longinotti -files/12_mod_auth_mysql.conf, -files/mod_auth_mysql.patch, metadata.xml, -mod_auth_mysql-3.0.0.ebuild, mod_auth_mysql-3.0.0-r1.ebuild: Ebuild cleanup, set mysql as herd too. + 13 Jan 2007; Luca Longinotti + +files/12_mod_auth_mysql.conf, -files/2.8.1/12_mod_auth_mysql.conf, + mod_auth_mysql-3.0.0-r1.ebuild, mod_auth_mysql-3.0.0-r2.ebuild: + Cleanup. + *mod_auth_mysql-3.0.0-r2 (09 Jan 2007) 09 Jan 2007; Christian Heim diff --git a/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf b/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf new file mode 100644 index 000000000000..cd3007e46121 --- /dev/null +++ b/net-www/mod_auth_mysql/files/12_mod_auth_mysql.conf @@ -0,0 +1,129 @@ + + + LoadModule mysql_auth_module modules/mod_auth_mysql.so + + + + + +# +# mod_auth_mysql can be used to limit access to documents by checking +# data in a MySQL database. +# + +# This will enable user-based MySQL authentication of everything +# within /home/httpd. You'll need to do the following as the MySQL +# root user beforehand: +# +# CREATE DATABASE auth; +# USE auth; +# CREATE TABLE users ( +# user_name CHAR(30) NOT NULL, +# user_passwd CHAR(20) NOT NULL, +# PRIMARY KEY (user_name) +# ); +# GRANT SELECT +# ON auth.users +# TO authuser@localhost +# IDENTIFIED BY 'PaSsW0Rd'; +# +# INSERT INTO users VALUES ('testuser', ENCRYPT('testpass')); +# +# +# AuthName "MySQL authenticated zone" +# AuthType Basic +# +# AuthMySQLUser authuser +# AuthMySQLPassword PaSsW0Rd +# AuthMySQLDB auth +# AuthMySQLUserTable users +# AuthMySQLNameField user_name +# AuthMySQLPasswordField user_passwd +# +# require valid-user +# + +# This will enable group-based MySQL authentication of everything +# within /home/httpd. You'll need to do the following as the MySQL +# root user beforehand: +# +# CREATE DATABASE auth; +# USE auth; +# CREATE TABLE users ( +# user_name CHAR(30) NOT NULL, +# user_passwd CHAR(20) NOT NULL, +# user_group CHAR(20) NOT NULL, +# PRIMARY KEY (user_name) +# ); +# GRANT SELECT +# ON auth.users +# TO authuser@localhost +# IDENTIFIED BY 'PaSsW0Rd'; +# +# INSERT INTO users VALUES ('testuser', ENCRYPT('testpass'), 'user'); +# INSERT INTO users VALUES ('testadmin', ENCRYPT('testpass'), 'admin'); +# +# +# AuthName "MySQL group authenticated zone" +# AuthType Basic +# +# AuthMySQLUser authuser +# AuthMySQLPassword PaSsW0Rd +# AuthMySQLDB auth +# AuthMySQLUserTable users +# AuthMySQLNameField user_name +# AuthMySQLPasswordField user_passwd +# AuthMySQLGroupField user_group +# +# require group admin +# + +# Like the above this enables group-based MySQL authentication of +# everything within /home/httpd, but this configuration allows users to +# belong to more than one group. You'll need to do the following as +# the MySQL root user beforehand: +# +# CREATE DATABASE auth; +# USE auth; +# CREATE TABLE users ( +# user_name CHAR(30) NOT NULL, +# user_passwd CHAR(20) NOT NULL, +# PRIMARY KEY (user_name) +# ); +# CREATE TABLE groups ( +# user_name CHAR(30) NOT NULL, +# user_group CHAR(20) NOT NULL, +# PRIMARY KEY (user_name, user_group) +# ); +# GRANT SELECT +# ON auth.users +# TO authuser@localhost +# IDENTIFIED BY 'PaSsW0Rd'; +# GRANT SELECT +# ON auth.groups +# TO authuser@localhost +# IDENTIFIED BY 'PaSsW0Rd'; +# +# INSERT INTO users VALUES ('testuser', ENCRYPT('testpass')); +# INSERT INTO groups VALUES ('testuser', 'user'); +# INSERT INTO users VALUES ('testadmin', ENCRYPT('testpass')); +# INSERT INTO groups VALUES ('testadmin', 'admin'); +# INSERT INTO groups VALUES ('testadmin', 'user'); +# +# +# AuthName "MySQL group authenticated zone" +# AuthType Basic +# +# AuthMySQLUser authuser +# AuthMySQLPassword PaSsW0Rd +# AuthMySQLDB auth +# AuthMySQLUserTable users +# AuthMySQLNameField user_name +# AuthMySQLPasswordField user_passwd +# AuthMySQLGroupTable groups +# AuthMySQLGroupField user_group +# +# require group user +# + + diff --git a/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild b/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild index 092f3e9bcf87..3685e54444a3 100644 --- a/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild +++ b/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild,v 1.3 2006/12/07 16:36:01 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r1.ebuild,v 1.4 2007/01/13 20:25:36 chtekk Exp $ inherit apache-module @@ -16,14 +16,12 @@ DEPEND="virtual/mysql sys-libs/zlib" RDEPEND="${DEPEND}" -BASE_CONFIG_PVR="2.8.1" - APXS1_ARGS="-DENABLE=0 -c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c" -APACHE1_MOD_CONF="${BASE_CONFIG_PVR}/12_mod_auth_mysql" +APACHE1_MOD_CONF="12_mod_auth_mysql" APACHE1_MOD_DEFINE="AUTH_MYSQL" APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c" -APACHE2_MOD_CONF="${BASE_CONFIG_PVR}/12_mod_auth_mysql" +APACHE2_MOD_CONF="12_mod_auth_mysql" APACHE2_MOD_DEFINE="AUTH_MYSQL" DOCFILES="README" diff --git a/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild b/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild index 8dda92f2c450..c7f85cb6bf56 100644 --- a/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild +++ b/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild,v 1.1 2007/01/09 21:27:49 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/mod_auth_mysql/mod_auth_mysql-3.0.0-r2.ebuild,v 1.2 2007/01/13 20:25:36 chtekk Exp $ inherit apache-module eutils @@ -16,14 +16,12 @@ DEPEND="virtual/mysql sys-libs/zlib" RDEPEND="${DEPEND}" -BASE_CONFIG_PVR="2.8.1" - APXS1_ARGS="-DENABLE=0 -c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c" -APACHE1_MOD_CONF="${BASE_CONFIG_PVR}/12_mod_auth_mysql" +APACHE1_MOD_CONF="12_mod_auth_mysql" APACHE1_MOD_DEFINE="AUTH_MYSQL" APXS2_ARGS="-c -I/usr/include/mysql -lmysqlclient -lm -lz ${PN}.c" -APACHE2_MOD_CONF="${BASE_CONFIG_PVR}/12_mod_auth_mysql" +APACHE2_MOD_CONF="12_mod_auth_mysql" APACHE2_MOD_DEFINE="AUTH_MYSQL" DOCFILES="README" -- 2.26.2