[Kolab-devel] gunnar: server/kolab-freebusy/freebusy config.php, 1.3, 1.4

[Richard Bos]

Hi,

shouldn't this (see below) have a "//FIXME:  not autoconfigured - still 
hardcoded"?

Op zondag 14 oktober 2007 14:32, schreef cvs at kolab.org:
> Index: config.php
> ===================================================================
> RCS file: /kolabrepository/server/kolab-freebusy/freebusy/config.php,v
> retrieving revision 1.3
> retrieving revision 1.4
> diff -u -d -r1.3 -r1.4
> --- config.php  8 Aug 2007 15:45:49 -0000       1.3
> +++ config.php  14 Oct 2007 12:31:58 -0000      1.4
> @@ -113,7 +113,7 @@
>  $params['send_content_disposition'] = false;
>  
>  // Where are we logging to?
> -$params['log'] = 'file:/kolab/var/apache2/log/freebusy/freebusy.log';    
>            // File... +$params['log'] =
> 'file:/kolab/var/apache/log/freebusy/freebusy.log';                //
> File... // $params['log'] = 'syslog:cons, pid';            // Or syslog... 
>  // What level of output should we log? Higher levels give more verbose
> output.

$params['log'] = 'file://@freebusy_logfile@'
This means that config.php should be moved to config.php.in

Same here:
> Index: kolabsrv.in
> ===================================================================
> RCS file: /kolabrepository/server/kolabd/kolabd/dist_conf/kolabsrv.in,v
> retrieving revision 1.7
> retrieving revision 1.8
> diff -u -d -r1.7 -r1.8
> --- kolabsrv.in 11 Mar 2006 21:39:16 -0000      1.7
> +++ kolabsrv.in 14 Oct 2007 12:31:58 -0000      1.8
> @@ -38,7 +38,7 @@
>  esac
>  
>  if [[ "$2" == "all" ]]; then
> -       SERVICES="@LDAPD@ slurpd saslauthd spamd amavis apache2 freshclam
> clamd cyrus postfix" +       SERVICES="@LDAPD@ slurpd saslauthd spamd
> amavis apache freshclam clamd cyrus postfix"

We should add a @APACHED@ variable in case of suse it is 'apache2'
Just @APACHED@ and that's it.

Not sure about this one:
Op zondag 14 oktober 2007 14:32, schreef cvs at kolab.org:
> --- Conf.pm     8 Oct 2007 15:38:05 -0000       1.10
> +++ Conf.pm     14 Oct 2007 12:31:58 -0000      1.11
> @@ -230,8 +230,8 @@
>                  $haschanged{'postfix'} = 1;
>              } elsif ($cfg =~ /saslauthd/) {
>                  $haschanged{'saslauthd'} = 1;
> -            } elsif ($cfg =~ /apache2/) {
> -                $haschanged{'apache2'} = 1;
> +            } elsif ($cfg =~ /apache/) {
> +                $haschanged{'apache'} = 1;

should @APACHED@ be used?  If so Conf.pm should be moved to Conf.pm.in

We (in this case opensuse) don't care about the apache config file (httpd.conf 
template) as we provide our own file that is "sourced in" by the config file 
that is provided by opensuse.

-- 
Richard Bos
Without a home the journey is endless