X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=blobdiff_plain;f=debian%2Fpostinst;h=11f8e3b6ed55cb8f0829a8ab71a15a16e82bc081;hb=1dc28180016188144d34dd99b60a43de83f96093;hp=8333a20c76ef09f6dfe39e7ebcd4061c83ff34a5;hpb=ec00b945992a7ab227a0f932b80d386d1f508e32;p=mailman-cn.git

diff --git a/debian/postinst b/debian/postinst
index 8333a20..11f8e3b 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -22,7 +22,7 @@ if [ ! -L /etc/apache2/conf.d/mailman-cn.conf -a ! -f /etc/apache2/conf.d/mailma
   ln -sf /etc/mailman/apache.conf /etc/apache2/conf.d/mailman-cn.conf
 fi
 
-HOSTNAME="`hostname --fqdn`"
+hostname="`hostname --fqdn`"
 
 mmcfg_add () {
   opt="$1"
@@ -56,7 +56,7 @@ cp_backup_conffile -p -d mailman $MM_CFG || true
 
 # ocisti smece od prosle verzije
 if dpkg --compare-versions "$2" lt 2:2.1.5-9; then
-  HN="'$HOSTNAME'"
+  HN="'$hostname'"
   grep -v -E 'DEFAULT_(URL_PATTERN|URL_HOST|EMAIL_HOST) =' $MM_CFG | \
   awk '/^# Default host for web interface of newly created MLs/ { print $0; print "DEFAULT_EMAIL_HOST = '$HN'"; getline } { print $0 }' | \
   awk '/^# Default domain for email addresses of newly created MLs/ { print $0;  print "DEFAULT_URL_HOST = '$HN'"; getline } { print $0 }' \
@@ -68,19 +68,19 @@ fi
 mmcfg_add "DEFAULT_SERVER_LANGUAGE" "'hr'"
 
 # sredi DEFAULT_URL_PATTERN
-mmcfg_add "DEFAULT_URL_PATTERN" "'http://%s/mailman/'"
+mmcfg_add "DEFAULT_URL_PATTERN" "'http://%s/cgi-bin/mailman/'"
 
 # sredi VIRTUAL_HOST_OVERVIEW
 mmcfg_add "VIRTUAL_HOST_OVERVIEW" "Off"
 
 # sredi DEFAULT_URL_HOST
-mmcfg_add "DEFAULT_URL_HOST" "'$HOSTNAME'"
+mmcfg_add "DEFAULT_URL_HOST" "'$hostname'"
 
 # sredi DEFAULT_EMAIL_HOST
-mmcfg_add "DEFAULT_EMAIL_HOST" "'$HOSTNAME'"
+mmcfg_add "DEFAULT_EMAIL_HOST" "'$hostname'"
 
 # sredi PRIVATE_ARCHIVE_URL
-mmcfg_add "PRIVATE_ARCHIVE_URL" "'/mailman/private'"
+mmcfg_add "PRIVATE_ARCHIVE_URL" "'/cgi-bin/mailman/private'"
 
 # kreirati link za smrsh
 if [ -d /etc/mail/smrsh/ ]; then
@@ -99,7 +99,7 @@ fi
 
 # kreirati mailman listu
 if [ -z "`list_lists | grep -i mailman`" ]; then
-  newlist -q mailman mailman@$HOSTNAME `pwgen 8 1` > /dev/null
+  newlist -q mailman mailman@$hostname `pwgen 8 1` > /dev/null
 fi
 
 # kreirati aliase
@@ -130,7 +130,7 @@ EOF
 # dodati roota na mailman listu:
 if [ ! "`list_members mailman | wc -l`" -ge 1 ]; then
   add_members -r - mailman <<EOF
-root@$HOSTNAME
+root@$hostname
 EOF
 fi
 
@@ -143,8 +143,6 @@ if ! echo $site_languages | grep -q 'hr'; then
   db_go || true
 fi
 db_set mailman/default_server_language "hr" || true
-db_go || true
-db_stop || true
 
 site_languages="`echo $site_languages | tr -d ','`"
 mm_etc=/etc/mailman
@@ -155,7 +153,7 @@ for lang in ${site_languages}; do
   echo -n "Installing site language ${lang} " >&2
   mkdir -p ${mm_etc}/${lang}
   for file in $(ls ${mm_dist}/${lang}); do
-    echo -n . >&2
+    printf . >&2
     langfile=${lang}/${file}
     ucf --debconf-ok --three-way ${mm_dist}/${langfile} ${mm_etc}/${langfile} 2>/dev/null
     # Upon install ucf leaves a duplicate in .dpkg-dist (Bug #238730), remove it
@@ -165,16 +163,18 @@ for lang in ${site_languages}; do
   echo " done." >&2
 done
 
+db_go || true
+db_stop || true
 
 # restart mailman
-if [ "$restart" = "yes" -a -x /etc/init.d/mailman ]; then
-  /etc/init.d/mailman stop
-  /etc/init.d/mailman start
+if [ "$restart" = "yes" -a -x /etc/init.d/mailman -a -x /usr/sbin/invoke-rc.d ]; then
+  invoke-rc.d mailman stop
+  invoke-rc.d mailman start
 fi
 
-# restartat apache2
-if [ -x /etc/init.d/apache2 ]; then
-  /etc/init.d/apache2 reload || true
+# reload apache2 
+if [ -x /usr/sbin/invoke-rc.d -a -x /etc/init.d/apache2 ]; then
+  invoke-rc.d apache2 reload
 fi
 
 # promjena passworda
@@ -185,4 +185,4 @@ if [ ! -f /var/lib/mailman/data/adm.pw ]; then
   echo "CN:     # mmsitepass"
   echo "CN:"
 fi
-echo "CN: Web interface is at http://$HOSTNAME/mailman/admin/"
+echo "CN: Web interface is at http://$hostname/cgi-bin/mailman/admin"