Commit 6538a2d4 authored by david.verdin's avatar david.verdin
Browse files

[feature] Reactivating the Sympa configuration wizard at first install, based...

[feature] Reactivating the Sympa configuration wizard at first install, based on Guillaume Rousse work.


git-svn-id: https://subversion.renater.fr/sympa/trunk@5857 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent ca766575
......@@ -53,14 +53,21 @@ installdir:
installconfig:
@echo "Installing basic configuration ..."
export PERL5LIB=$(DESTDIR)$(modulesdir); \
if [ ! -f $(DESTDIR)$(sysconfdir)/sympa.conf ]; then \
echo "This looks like your first Sympa installation. The following wizard will assit you to create your first Sympa configuration.";\
$(DESTDIR)$(sbindir)/sympa_wizard.pl \
--create sympa.conf \
--target $(DESTDIR)$(sysconfdir)/sympa.conf \
|| /bin/true; \
$(DESTDIR)$(sbindir)/sympa_wizard.pl \
--create wwsympa.conf \
--target $(DESTDIR)$(sysconfdir)/wwsympa.conf \
|| /bin/true; \
$(DESTDIR)$(sbindir)/sympa_wizard.pl || /bin/true;\
fi
$(DESTDIR)$(sbindir)/sympa_wizard.pl \
--create sympa.conf \
--target $(DESTDIR)$(sysconfdir)/sympa.conf \
--check \
|| /bin/true; \
$(DESTDIR)$(sbindir)/sympa_wizard.pl \
--create wwsympa.conf \
--target $(DESTDIR)$(sysconfdir)/wwsympa.conf \
|| /bin/true
if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \
cd $(DESTDIR)$(sysconfdir); \
echo "# automatically created file" >> data_structure.version; \
......@@ -72,7 +79,7 @@ installconfig:
nextstep:
@echo ""
@echo "** You can find documentation at:"
@echo "** http://www.sympa.org/documentation/manual/sympa-$(SYMPA_VERSION).pdf"
@echo "** http://www.sympa.org/documentation/manual/sympa-$(VERSION).pdf"
@echo ""
@echo "#########################################################"
@echo "# If you install Sympa for the first time on this server"
......
......@@ -57,6 +57,7 @@ if test -f /etc/sympa.conf; then
staticdir=$prefix/static_content
arcdir=$prefix/arc
bouncedir=$prefix/bounce
localedir=$prefix/locale
confdir=/etc
else
initdir=$sysconfdir/rc.d/init.d
......@@ -73,6 +74,7 @@ else
staticdir=$localstatedir/static_content
arcdir=$localstatedir/arc
bouncedir=$localstatedir/bounce
localedir=$defaultdir/locale
confdir=$sysconfdir
fi
......@@ -91,6 +93,7 @@ AC_SUBST(spooldir)
AC_SUBST(staticdir)
AC_SUBST(arcdir)
AC_SUBST(bouncedir)
AC_SUBST(localedir)
AC_SUBST(confdir)
# allow user to redefine some of them
......
......@@ -172,7 +172,7 @@ our @params = (
},
{
name => 'http_host',
default => '',
default => 'http://domain.tld',
query => 'URL to a virtual host.',
vhost => '1',
file => 'sympa.conf',
......@@ -182,6 +182,7 @@ our @params = (
default => Sympa::Constants::EXPLDIR . '/static_content',
query => 'The directory where Sympa stores static contents (CSS, members pictures, documentation) directly delivered by Apache',
vhost => '1',
edit => '1',
file => 'sympa.conf',
},
{
......@@ -189,6 +190,7 @@ our @params = (
default => '/static-sympa',
query => 'The URL mapped with the static_content_path directory defined above',
vhost => '1',
edit => '1',
file => 'sympa.conf',
},
{ title => 'Syslog' },
......@@ -319,7 +321,6 @@ our @params = (
default => '1',
query => 'The minimum number of packets in database before the bulk forks to increase sending rate',
file => 'sympa.conf',
edit => '1',
advice => '',
},
{
......@@ -327,7 +328,6 @@ our @params = (
default => '3',
query => 'The max number of bulks that will run on the same server.',
file => 'sympa.conf',
edit => '1',
advice => '',
},
{
......@@ -335,7 +335,6 @@ our @params = (
default => '600',
query => 'the number of seconds a slave bulk will remain running without processing a message before it spontaneously dies.',
file => 'sympa.conf',
edit => '1',
advice => '',
},
{
......@@ -343,7 +342,6 @@ our @params = (
default => '10',
query => 'The number of seconds a master bulk waits between two packets number checks.',
file => 'sympa.conf',
edit => '1',
advice => 'Keep it small if you expect brutal increases in the message sending load.',
},
{
......
......@@ -168,7 +168,7 @@ sub edit_configuration {
my (@new_wwsympa_conf, @new_sympa_conf);
## Edition mode
foreach my $param (@Conf::params) {
foreach my $param (@confdef::params) {
my $desc;
if ($param->{'title'}) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment