[svn] Retrieving latest developments from Guillaume's branch.

git-svn-id: https://subversion.renater.fr/sympa/trunk@5981 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce

Makefile.am

@@ -33,20 +33,20 @@ installdir:
 	@for dir in $(expldir) $(spooldir) $(spooldir)/msg $(spooldir)/digest \
 		$(spooldir)/moderation $(spooldir)/expire $(spooldir)/auth \
 		$(spooldir)/outgoing $(spooldir)/tmp $(spooldir)/task \
-		$(bouncedir) $(arcdir) $(piddir); do \
+		$(bouncedir) $(arcdir) $(piddir) $(staticdir); do \
 		if [ ! -d $(DESTDIR)$$dir ] ; then \
 			echo "Creating $(DESTDIR)$$dir"; \
 			install -d -m 755 $(DESTDIR)$$dir; \
-			chown $(USER) $(DESTDIR)$$dir || /bin/true; \
-			chgrp $(GROUP) $(DESTDIR)$$dir || /bin/true; \
-		fi \
+		fi; \
+		chown $(USER) $(DESTDIR)$$dir || /bin/true; \
+		chgrp $(GROUP) $(DESTDIR)$$dir || /bin/true; \
 	done
 	@echo "Creating non-writable directories"
 	@for dir in create_list_templates mail_tt2 web_tt2 scenari \
 		task_models general_task_models; do \
-		if [ ! -d $(DESTDIR)$(sysconfdir)/$$dir ] ; then \
-			echo "Creating $(DESTDIR)$(sysconfdir)/$$dir"; \
-			install -d -m 755 $(DESTDIR)$(sysconfdir)/$$dir; \
+		if [ ! -d $(DESTDIR)$(sysconfdir)/sympa/$$dir ] ; then \
+			echo "Creating $(DESTDIR)$(sysconfdir)/sympa/$$dir"; \
+			install -d -m 755 $(DESTDIR)$(sysconfdir)/sympa/$$dir; \
 		fi \
 	done
 
@@ -63,13 +63,9 @@ installconfig:
 			--create wwsympa.conf \
 			--target $(DESTDIR)$(confdir)/wwsympa.conf \
 			|| /bin/true; \
-		$(DESTDIR)$(sbindir)/sympa_wizard.pl || /bin/true;\
 	fi
-	$(DESTDIR)$(sbindir)/sympa_wizard.pl \
-		--check \
-		|| /bin/true; \
-	if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \
-		cd $(DESTDIR)$(sysconfdir); \
+	if [ ! -f $(DESTDIR)$(sysconfdir)/sympa/data_structure.version ]; then \
+		cd $(DESTDIR)$(sysconfdir)/sympa; \
 		echo "# automatically created file" >> data_structure.version; \
 		echo "# you should not modify it" >> data_structure.version; \
 		echo $(VERSION) >> data_structure.version; \
@@ -83,11 +79,16 @@ nextstep:
 	@echo "** http://www.sympa.org/documentation/manual/sympa-$(VERSION).pdf"
 	@echo ""
 	@echo "#########################################################"
-	@echo "# If you install Sympa for the first time on this server"
-	@echo "# you should check the INSTALL file."
+	@echo "# If you are installing, you should check the INSTALL file"
+	@echo "# and run the installation wizard:"
+	@echo "# $(sbindir)/sympa.pl"
+	@echo "#"
+	@echo "# If you are upgrading, you just need to run"
+	@echo "# $(sbindir)/sympa.pl --upgrade"
 	@echo "#"
-	@echo "# If you are upgrading, you now need to run"
-	@echo "#    $(sbindir)/sympa.pl --upgrade"
+	@echo "# In both case, you should run the wizard to check you"
+	@echo "# have all perl modules needed:"
+	@echo "# $(sbindir)/sympa_wizard.pl --check"
 	@echo "#######################################################"
 
 importantchanges:

configure.ac

@@ -69,12 +69,12 @@ else
     mailtemplatedir=$defaultdir/mail_tt2
     webtemplatedir=$defaultdir/web_tt2
     execcgidir=$libdir/sympa/cgi
-    expldir=$localstatedir/list_data
-    spooldir=$localstatedir/spool
-    staticdir=$localstatedir/static_content
-    arcdir=$localstatedir/arc
-    bouncedir=$localstatedir/bounce
-    localedir=$defaultdir/locale
+    expldir=$localstatedir/lib/sympa
+    staticdir=$localstatedir/lib/sympa/static_content
+    spooldir=$localstatedir/spool/sympa
+    arcdir=$localstatedir/lib/sympa/arc
+    bouncedir=$localstatedir/lib/sympa/bounce
+    localedir=$datadir/sympa/locale
     confdir=$sysconfdir
 fi
 

src/lib/confdef.pm

@@ -139,47 +139,54 @@ our @params = (
     },
     {
         name    => 'queuedistribute',
-        default => 'undef,',
 	file    => 'sympa.conf'
     },
     {
         name    => 'queueautomatic',
-        default => 'undef',
+        default => Sympa::Constants::SPOOLDIR . '/',
+        query   => 'Automatic list creation spool',
 	file    => 'sympa.conf'
     },
     {
         name    => 'queuedigest',
-        default => 'undef',
+        default => Sympa::Constants::SPOOLDIR . '/moderation',
+        query   => '',
 	file    => 'sympa.conf'
     },
     {
         name    => 'queuemod',
-        default => 'undef',
+        default => Sympa::Constants::SPOOLDIR . '/moderation',
+        query   => '',
 	file    => 'sympa.conf'
     },
     {
         name    => 'queuetopic',
-        default => 'undef',
+        default => Sympa::Constants::SPOOLDIR . '/topic',
+        query   => '',
 	file    => 'sympa.conf'
     },
     {
         name    => 'queueauth',
-        default => 'undef',
+        default => Sympa::Constants::SPOOLDIR . '/auth',
+        query   => '',
 	file    => 'sympa.conf'
     },
     {
         name    => 'queueoutgoing',
-        default => 'undef',
+        default => Sympa::Constants::SPOOLDIR . '/outgoing',
+        query   => '',
 	file    => 'sympa.conf'
     },
     {
         name    => 'queuetask',
-        default => 'undef',
+        default => Sympa::Constants::SPOOLDIR . '/task',
+        query   => '',
 	file    => 'sympa.conf'
     },
     {
         name    => 'queuesubscribe',
-        default => 'undef',
+        default => Sympa::Constants::SPOOLDIR . '/subscribe',
+        query   => '',
 	file    => 'sympa.conf'
     },
     {
@@ -187,6 +194,7 @@ our @params = (
         default => 'http://domain.tld',
         query   => 'URL to a virtual host.',
 	vhost   => '1',
+        edit    => '1',
         file    => 'sympa.conf',
     },	      
     {
@@ -265,6 +273,7 @@ our @params = (
         name    => 'domain',
         default => 'domain.tld',
         query   => 'Main robot hostname',
+        edit    => '1',
         file    => 'sympa.conf',
     },
     {
@@ -281,6 +290,7 @@ our @params = (
         default => 'sympa',
         query   => 'Local part of sympa email adresse',
 	vhost   => '1',
+        edit    => '1',
         file    => 'sympa.conf',
         advice  => 'Effective address will be \[EMAIL\]@\[HOST\]',
     },
@@ -380,7 +390,6 @@ our @params = (
         default => '1',
         query   => 'the number of seconds a bulk sleeps between starting a new loop if it didn\'t find a message to send.',
         file    => 'sympa.conf',
-        edit    => '1',
         advice  => 'Keep it small if you want your server to be reactive.',
     },
     {
@@ -861,7 +870,6 @@ our @params = (
     },
     {
         name    => 'tmpdir',
-        default => 'undef',
     },
     {
         name    => 'sleep',

sympa.spec.in

@@ -52,8 +52,8 @@ encryption.
 %build
 ./configure \
     --prefix=%{_prefix} \
+    --libdir=%{_libdir} \
     --sysconfdir=%{_sysconfdir} \
-    --confdir=%{_confdir} \
     --localstatedir=%{_localstatedir}
 make
 
@@ -84,8 +84,12 @@ fi
 %attr(-,sympa,sympa) %{_localstatedir}/lib/sympa
 %attr(-,sympa,sympa) %{_localstatedir}/spool/sympa
 %{_sbindir}/*
+%{_libexecdir}/*
 %{_libdir}/sympa
 %{_mandir}/man8/*
 %{_datadir}/sympa
 %{_datadir}/locale/*/*/*
-%config(noreplace) %{_confdir}/sympa.conf
+%config(noreplace) %{_sysconfdir}/sympa.conf
+%config(noreplace) %{_sysconfdir}/wwsympa.conf
+%config(noreplace) %{_sysconfdir}/sympa
+%{_initrddir}/sympa