Version bump; cleaned up sed and apachever stuff for bug 83978. Added enhanced postinst-en.txt written by Jakub Moc in bug 81978.

(Portage version: 2.0.51.19)

2 files changed, 138 insertions, 0 deletions

diff --git a/net-www/awstats/files/digest-awstats-6.4 b/net-www/awstats/files/digest-awstats-6.4
new file mode 100644
index 000000000000..828cff76dc65
--- /dev/null
+++ b/net-www/awstats/files/digest-awstats-6.4
@@ -0,0 +1 @@
+MD5 056e6fb0c7351b17fe5bbbe0aa1297b1 awstats-6.4.tgz 918435
diff --git a/net-www/awstats/files/postinst-en.txt b/net-www/awstats/files/postinst-en.txt
index 2b289c6be30a..f95caeaf28f0 100644
--- a/net-www/awstats/files/postinst-en.txt
+++ b/net-www/awstats/files/postinst-en.txt
@@ -2,6 +2,8 @@ Alias /awstats/classes "/usr/share/webapps/awstats/PVR/htdocs/classes/"
 Alias /awstats/css "/usr/share/webapps/awstats/PVR/htdocs/css/"
 Alias /awstats/icons "/usr/share/webapps/awstats/PVR/htdocs/icon/"
 ScriptAlias /awstats/ "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/"
+ScriptAlias /awstats "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/awstats.pl"
+ScriptAlias /awstats.pl "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/awstats.pl"
 
 <Directory "/usr/share/webapps/awstats/PVR/htdocs">
     Options None
@@ -20,3 +22,138 @@ ScriptAlias /awstats/ "/usr/share/webapps/awstats/PVR/hostroot/cgi-bin/"
 	Allow from all
     </IfModule>
 </Directory>
+
+###
+# NOTE: The following sections are strictly optional. Please read
+# and follow carefully all the instructions before uncommenting
+# any lines. Examples shown below are for Apache 2.0.x ONLY.
+###
+
+###
+# INSTRUCTIONS:
+#
+# If you would like to require authentication to access AWStats,
+# then uncomment ONE of the example Directory sections below.
+#
+# NOTE: Related AWStats configuration directives are:
+#
+# AllowAccessFromWebToAuthenticatedUsersOnly=1
+# AllowAccessFromWebToFollowingAuthenticatedUsers="user1 [user2 ...]"
+#
+# You can use these to set a per-domain user access when needed 
+# for virtual hosting. That means: only the selected user(s) will have
+# access to stats for the particular domain. All other users
+# will not be allowed to see the domain stats even though they
+# have authenticated successfully.
+###
+
+###
+# SECTION I - Basic Authentication
+#
+# The following example requires mod_auth to work.
+# You need to uncomment the following line in apache2.conf 
+# and restart Apache to get the module loaded:
+#
+# LoadModule auth_module                   modules/mod_auth.so
+#
+# Add your AWStats users to /etc/awstats/.htpasswd file.
+# Please see 'man htpasswd2' for more details if you need.
+#
+# htpasswd2 -c /etc/awstats/.htpasswd username1
+# htpasswd2 /etc/awstats/.htpasswd username2
+# etc...
+###
+
+#<IfModule mod_auth.c>
+#<Directory "/usr/share/webapps/awstats/PVR/hostroot">
+#    Options None
+#    AllowOverride None
+#    Order allow,deny
+#    Allow from all
+#
+#    AuthType Basic
+#    AuthName "AWStats authenticated zone"
+#    AuthUserFile /etc/awstats/.htpasswd
+#    Require valid-user
+#
+#</Directory>
+#</IfModule>
+
+###
+# SECTION II - Digest Authentication
+#
+# The following example requires mod_auth_digest to work.
+# You need to uncomment the following line in apache2.conf
+# and restart Apache to get the module loaded:
+#
+# LoadModule auth_digest_module            modules/mod_auth_digest.so
+#
+# Do not forget to replace www.example.com as appropriate. You can also add
+# as many domains as you need to this line.
+#
+# Add your AWStats users to /etc/awstats/.htdigest file. Please see 
+# 'man htdigest2' and http://httpd.apache.org/docs-2.0/mod/mod_auth_digest.html
+# for more details if you need.
+#
+# htdigest2 -c /etc/awstats/.htdigest "AWStats authenticated zone" username1
+# htdigest2 /etc/awstats/.htdigest "AWStats authenticated zone" username2
+# etc...
+###
+
+#<IfModule mod_auth_digest.c>
+#<Directory "/usr/share/webapps/awstats/PVR/hostroot">
+#    Options None
+#    AllowOverride None
+#    Order allow,deny
+#    Allow from all
+
+#    AuthType Digest
+#    AuthName "AWStats authenticated zone"
+#    AuthDigestFile /etc/awstats/.htdigest
+#    AuthDigestDomain http://www.example.com https://www.example.com
+#    require valid-user
+#    # The following line is REQUIRED to work around a bug in MSIE.
+#    # See http://httpd.apache.org/docs-2.0/mod/mod_auth_digest.html
+#    BrowserMatch "MSIE" AuthDigestEnableQueryStringHack=On
+#</Directory>
+#</IfModule>
+
+###
+# SECTION III - MySQL Authentication
+#
+# The following example requires mod_auth_mysql to work.
+# Emerge mod_auth_mysql and follow the instructions in
+# 12_mod_auth_mysql.conf to create MySQL database required
+# for authentication. After you finished adding users, add
+# '-D AUTH_MYSQL' to your /etc/conf.d/apache2 APACHE2_OPTS
+# setting and restart Apache to get the module loaded.
+###
+
+#<IfModule mod_auth_mysql.c>
+#<Directory "/usr/share/webapps/awstats/PVR/hostroot">
+#    Options None
+#    AllowOverride None
+#    Order allow,deny
+#    Allow from all
+
+#    AuthName "AWStats MySQL authenticated zone"
+#    AuthType Basic
+#    AuthMySQLUser authuser
+#    AuthMySQLPassword PaSsW0Rd
+#    AuthMySQLDB auth
+#    AuthMySQLUserTable users
+#    AuthMySQLNameField user_name
+#    AuthMySQLPasswordField user_passwd
+#    # Uncomment the two lines below ONLY if you have
+#    # the required table for group-based MySQL authentication
+#    # in your MySQL database.
+#    #AuthMySQLGroupTable groups
+#    #AuthMySQLGroupField user_group
+#
+#    # Uncomment one of the following directives according
+#    # to the database structure you have chosen.
+#    #require valid-user
+#    #require group your_group_name_here
+
+#</Directory>
+#</IfModule>