[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.10.1+dfsg-2-1-g4c3e8d1

[Julien Valroff]

The following commit has been merged in the master branch:
commit 4c3e8d133ba188080619898a0b0336e38a742fa4
Author: Julien Valroff <julien at kirya.net>
Date:   Thu Aug 18 16:37:48 2011 +0200

    Fix Apache configuration example (Closes: #638289)

diff --git a/debian/apache2.conf b/debian/apache2.conf
index 6f3c598..27dee6b 100644
--- a/debian/apache2.conf
+++ b/debian/apache2.conf
@@ -11,39 +11,57 @@
 #
 # Install this file in Apache configuration directory:
 # # cp /usr/share/doc/dspam-webfrontend/examples/apache2.conf \
-#       /etc/apache2/conf.d/dspam.conf
+#       /etc/apache2/conf.d/dspam
 #
-# Then visit http://127.0.0.1/dspam and log in.
+# Then visit http://127.0.0.1:8024 and log in.
 #
 # Add the admin username to /etc/dspam/admins, which will enable the
 # 'Administrative Suite' tab and functionality for that person.
 
-SuexecUserGroup dspam dspam
-
-Alias /dspam /var/www/dspam/
-Alias /usr/share/dspam /usr/share/dspam/
-
-LogLevel debug
+Listen 8024
 
 <Directory /var/www/dspam/>
-    Addhandler cgi-script .cgi
-    Options +ExecCGI +MultiViews -Indexes
-    AllowOverride None
-
-    AuthType Basic
-    AuthName "DSPAM Control Center"
-    AuthUserFile /etc/dspam/passwd
-    Require valid-user
-    DirectoryIndex dspam.cgi
+    # This makes the /dspam directory unavailable from the default virtual host
+    Order deny,allow
+    Deny from all
 </Directory>
 
-<Directory /usr/share/dspam/>
-    Options -Indexes
-    AllowOverride None
-</Directory>
+<VirtualHost *:8024>
+    DocumentRoot /var/www/dspam/
+    SuexecUserGroup dspam dspam
+
+    Alias /usr/share/dspam /usr/share/dspam/
+
+    <Directory /var/www/dspam/>
+        Addhandler cgi-script .cgi
+        DirectoryIndex dspam.cgi
+
+        Options +ExecCGI +MultiViews -Indexes
+
+        AllowOverride None
+
+        Order deny,allow
+        Deny from all
+
+        # This makes the DSPAM WebUI only available from the local machine
+	# You may obviously want to add other IP adresses (local network etc.)
+        # to the following line
+        Allow from 127.0.0.0/255.0.0.0 ::1/128
+
+        AuthType Basic
+        AuthName "DSPAM Control Center"
+        AuthUserFile /etc/dspam/passwd
+        Require valid-user
+    </Directory>
+
+    <Directory /usr/share/dspam/>
+        Options -Indexes
+        AllowOverride None
+    </Directory>
+</VirtualHost>
 
 # The above configuration is provided only as an example.  For serious work
-# over the internet, it should be set up as a proper name-based VirtualHost and
-# SSL should be used to protect the user's credentials.  If the site has many
+# over the internet, it should be set up as a proper VirtualHost and SSL
+# should be used to protect the user's credentials.  If the site has many
 # users, consider using one of the db-based authentication methods,
 # e.g. mod_auth_mysql.
diff --git a/debian/changelog b/debian/changelog
index 72261d2..180589c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dspam (3.10.1+dfsg-3) unstable; urgency=low
+
+  * Fix Apache configuration example (Closes: #638289) 
+
+ -- Julien Valroff <julien at debian.org>  Thu, 18 Aug 2011 15:51:45 +0200
+
 dspam (3.10.1+dfsg-2) unstable; urgency=low
 
   * Let libdspam7-dbg suggest libc-debug 

-- 
Debian packages for the DSPAM anti-spam filter