[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. upstream/3.9.1_rc1+git20110312.9a9050f-89-g4d99775

[Julien Valroff]

The following commit has been merged in the master branch:
commit 4d99775a29aa8055826582a6d45ae729967f7193
Author: Julien Valroff <julien at kirya.net>
Date:   Mon Mar 28 16:10:04 2011 +0200

    Rewrite apache configuration snippet

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 86e49ce..30e95f4 100644
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -11,5 +11,8 @@ TODO list for DSPAM debian packages
   Debian Policy:
     http://www.debian.org/doc/debian-policy/ch-customized-programs.html#s-web-appl
 
+* Build TB plugin as a separate package?
 
-* Buikd TB plugin as a separate package?
+* Install automatically a working webfrontend instance for Apache, which implies adding
+  a debconf screen prompting for a username and password to create eg. /etc/dspam/passwd
+  as well as adding the username to /etc/dspam/admins
diff --git a/debian/apache2.conf b/debian/apache2.conf
index a86e5b2..6130839 100644
--- a/debian/apache2.conf
+++ b/debian/apache2.conf
@@ -2,38 +2,44 @@
 #
 # Use htpasswd to create /etc/dspam/passwd and add a system username.
 # The password should not be the same as the user's system password.
-#
+# # htpasswd -c /etc/dspam/passwd <username>
 # # chown root.www-data /etc/dspam/passwd && chmod 640 /etc/dspam/passwd
 #
-# Make sure the suexec module is loaded:
-#       a2enmod suexec
+# Make sure the suexec module is installed and loaded:
+# # apt-get install apache2-suexec
+# # a2enmod suexec
+#
+# Install this file in Apache configuration directory:
+# # cp /usr/share/doc/dspam-webfrontend/examples/apache2.conf /etc/apache2/conf.d/dspam.conf
 #
 # Then visit http://127.0.0.1/dspam and log in.
 #
 # Add the admin username to /etc/dspam/admins, which will enable the
 # 'Administrative Suite' tab and functionality for that person.
 
-<VirtualHost 127.0.0.1>
-    Servername 127.0.0.1
-    SuexecUserGroup dspam dspam
-    Alias /dspam /var/www/dspam/
-    Alias /usr/share/dspam /usr/share/dspam/
-    LogLevel debug
-    <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
-    </Directory>
-    <Directory /usr/share/dspam/>
-        Options -Indexes
-        AllowOverride None
-    </Directory>
-</VirtualHost>
+SuexecUserGroup dspam dspam
+
+Alias /dspam /var/www/dspam/
+Alias /usr/share/dspam /usr/share/dspam/
+
+LogLevel debug
+
+<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
+</Directory>
+
+<Directory /usr/share/dspam/>
+    Options -Indexes
+    AllowOverride None
+</Directory>
 
 # 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

-- 
Debian packages for the DSPAM anti-spam filter