committing changes in /etc after emerge run

Package changes:

diff --git a/.etckeeper b/.etckeeper
index 60dbae3407bd289d4dc89eb14b7f39b8c4b3b7ab..3ab3aa16d914feafbb7f70d02b759e3d75329df7 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -158,7 +158,6 @@ maybe chmod 0644 'apache2/modules.d/00_mod_userdir.conf'
 maybe chmod 0644 'apache2/modules.d/00_mpm.conf'
 maybe chmod 0644 'apache2/modules.d/10_mod_mem_cache.conf'
 maybe chmod 0644 'apache2/modules.d/11_mod_auth_kerb.conf'
-maybe chmod 0644 'apache2/modules.d/12_mod_auth_mysql.conf'
 maybe chmod 0644 'apache2/modules.d/20_mod_fastcgi.conf'
 maybe chmod 0644 'apache2/modules.d/20_mod_fcgid.conf'
 maybe chmod 0644 'apache2/modules.d/40_mod_ssl.conf'

diff --git a/apache2/modules.d/12_mod_auth_mysql.conf b/apache2/modules.d/12_mod_auth_mysql.conf
deleted file mode 100644 (file)
index f33ced4..0000000
--- a/apache2/modules.d/12_mod_auth_mysql.conf
+++ /dev/null
@@ -1,132 +0,0 @@
-<IfDefine AUTH_MYSQL>
-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'));
-#
-#<Directory /home/httpd>
-#      # If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
-#      # the following line:
-#      #AuthBasicAuthoritative Off
-#      AuthName "MySQL authenticated zone"
-#      AuthType Basic
-#
-#      AuthMySQLUser authuser
-#      AuthMySQLPassword PaSsW0Rd
-#      AuthMySQLDB auth
-#      AuthMySQLUserTable users
-#      AuthMySQLNameField user_name
-#      AuthMySQLPasswordField user_passwd
-#
-#      require valid-user
-#</Directory>
-
-# 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');
-#
-#<Directory /home/httpd>
-#      # If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
-#      # the following line:
-#      #AuthBasicAuthoritative Off
-#      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
-#</Directory>
-
-# 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');
-#
-#<Directory /home/httpd>
-#      # If you want tot make mod_auth_mysql work with apache-2.2, please uncomment
-#      # the following line:
-#      #AuthBasicAuthoritative Off
-#      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
-#</Directory>
-</IfDefine>
-
-# vim: ts=4 filetype=apache