Changeset 1773

Timestamp:

01/13/07 00:48:07 (6 years ago)

Author:

anarcat

Message:

add an apache configuration for alternc-mailman instead of hacking the httpd.conf. we now use the standard images/mailman and pipermail aliases for mailman (/pipermail and /images/mailman)

Location:

alternc-mailman/trunk

Files:

• alternc-mailman.conf (added)
• debian/dirs (modified) (1 diff)
• debian/postinst (modified) (2 diffs)
• debian/postrm (modified) (1 diff)
• debian/rules (modified) (1 diff)
• mm_cfg.py (modified) (2 diffs)

alternc-mailman/trunk/debian/dirs

@@ -1 +1 @@
 etc/alternc/templates/mailman
+etc/apache/conf.d
+etc/apache-ssl/conf.d
 usr/lib/alternc
 usr/share/alternc/install

alternc-mailman/trunk/debian/postinst

@@ -10 +10 @@
 MAILMAN_CONFIG_BACKUP="/var/backups/alternc/etc-mailman-mm_cfg.py"
 MAILMAN_SCRIPT="/var/lib/mailman/mail/mailman"
-
-# Add mailman aliases to the apache configuration file given as argument
-function configure {
-    if ! grep -Eq "\*\*\*MAILMAN\*\*\*" $1; then
-        cp -a -f $1 $1.tmp
-        sed -e "s/\*\*\*ALTERNC_ALIASES\*\*\*/&\\
-            # ***MAILMAN*** \\
-        Alias \/marchives\/ \/var\/lib\/mailman\/archives\/public\/ \\
-        Alias \/mimages\/ \/usr\/share\/images\/mailman\//" < $1 > $1.tmp
-        mv -f $1.tmp $1
-    fi
-}
-
 
 case "$1" in
@@ -65 +52 @@
     fi
 
-    # Refresh apache configuration
-    configure /etc/alternc/templates/apache/httpd.conf
-    configure /etc/alternc/templates/apache-ssl/httpd.conf
     ln -sf /usr/lib/cgi-bin/mailman /var/alternc/cgi-bin/mailman
     alternc.install

alternc-mailman/trunk/debian/postrm

@@ -4 +4 @@
 MENUFILE="/etc/alternc/menulist.txt"
 
-# Remove mailman aliases to the apache configuration file given as argument
-function unconfigure {
-    if grep -Eqs "\*\*\*MAILMAN\*\*\*" $1; then
-        cp -a -f $1 $1.alternc_mailman
-        cat $1 | grep -v "\*\*\*MAILMAN\*\*\*" |
-            grep -v "   Alias /marchives/ /var/lib/mailman/archives/public/" |
-            grep -v "Alias /mimages/ /usr/share/images/mailman/" \
-            > $1.alternc_mailman
-        mv -f $1.alternc_mailman $1 
-    fi
-}
-
 case "$1" in
   remove)
-    # Remove Mailman references from Apache configuration
-    unconfigure /etc/alternc/templates/apache/httpd.conf
-    unconfigure /etc/alternc/templates/apache-ssl/httpd.conf
     alternc.install
 
-    rm -f /var/alternc/cgi-bin/mailman
+    rm -f /var/alternc/cgi-bin/mailman /etc/apache{,-ssl}/conf.d/alternc-mailman.conf
 
     if grep -qs "menu_mailman.php" $MENUFILE; then

alternc-mailman/trunk/debian/rules

@@ -29 +29 @@
         install -m 0644 mm_cfg.py \
                 debian/alternc-mailman/etc/alternc/templates/mailman/
+        install -m 0644 alternc-mailman.conf debian/alternc-mailman/etc/apache/conf.d/
+        install -m 0644 alternc-mailman.conf debian/alternc-mailman/etc/apache-ssl/conf.d/
         # Install the binaries : -rwxr-sr-x
         install -m 02755 -o root -g list \

alternc-mailman/trunk/mm_cfg.py

@@ -66 +66 @@
 DEFAULT_HOST_NAME = '%%fqdn%%'
 DEFAULT_URL_PATTERN = 'https://%s/cgi-bin/mailman/'
-IMAGE_LOGOS       = '/mimages/'
+IMAGE_LOGOS       = '/images/mailman/'
 USE_ENVELOPE_SENDER = 0
 DEFAULT_SEND_REMINDERS = 0
@@ -73 +73 @@
 MAILMAN_OWNER     = 'root@%%fqdn%%'
 
-PUBLIC_ARCHIVE_URL = '/marchives/%(listname)s'
+PUBLIC_ARCHIVE_URL = '/pipermail/%(listname)s'
 PRIVATE_ARCHIVE_URL = '/cgi-bin/mailman/private/%(listname)s'
 DEFAULT_ARCHIVE_PRIVATE    = 1                    # 0=public, 1=private