[Yawcs-cvs] yawcs webconf.pl,1.5,1.6

[<tre...@us...>]

Update of /cvsroot/yawcs/yawcs
In directory sc8-pr-cvs1:/tmp/cvs-serv29893

Modified Files:
	webconf.pl 
Log Message:
Inserted User Config


Index: webconf.pl
===================================================================
RCS file: /cvsroot/yawcs/yawcs/webconf.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** webconf.pl	13 Mar 2003 12:30:52 -0000	1.5
--- webconf.pl	13 Mar 2003 14:17:40 -0000	1.6
***************
*** 27,31 ****
  &read_config; ## Die Konfiguration aus MYSQL Datenbank einlesen....
  
! print<<output if($config{'debug'} eq 1);
  \n\n
  ###################################
--- 27,31 ----
  &read_config; ## Die Konfiguration aus MYSQL Datenbank einlesen....
  
! print<<output if($config{debug});
  \n\n
  ###################################
***************
*** 44,48 ****
  &STATS; ## build Usage Stats !!
  &SENDMAIL; ## SENDMAIL CONFIG BAUEN !!
! print "FERTIG !!!\n\n"if($config{'debug'} eq 1);
  exit;
  
--- 44,48 ----
  &STATS; ## build Usage Stats !!
  &SENDMAIL; ## SENDMAIL CONFIG BAUEN !!
! print "FERTIG !!!\n\n"if($config{debug});
  exit;
  
***************
*** 112,116 ****
  NAMED
  
! my $sql2 = qq[SELECT sub, ddns, ddns_ip FROM subdomains WHERE domain='$domain->[0]'];#'
  $cursor2 = $dbh->prepare($sql2) or die "SELECT failed: $sql2";
  $cursor2->execute() or die $cursor2->errstr;
--- 112,116 ----
  NAMED
  
! my $sql2 = qq[SELECT sub, ddns, ddns_ip FROM subdomains WHERE domain='$domain->[0]'];
  $cursor2 = $dbh->prepare($sql2) or die "SELECT failed: $sql2";
  $cursor2->execute() or die $cursor2->errstr;
***************
*** 134,157 ****
  sub APACHE
  {
! print "Erstelle Apache Konfiguration...\n"if($config{'debug'} eq 1);
! open(APACHE,">$config{'apache_conf'}");
  &db_open;
! my $sql = qq[SELECT subdomain, domain, kunde, pfad, noapache FROM subdomains];
  $cursor = $dbh->prepare($sql) or die "SELECT failed: $sql";
  $cursor->execute() or die $cursor->errstr;
  while(defined($sub=$cursor->fetch)){
  unless($sub->[4]){
! mkdir "$config{'apache_kdbase'}/$sub->[2]$sub->[3]" unless -e "$config{'apache_kdbase'}/$sub->[2]$sub->[3]";
  
  print APACHE<<EOF;
! <VirtualHost $config{'ip'}:80>
  ServerName $sub->[0]
  ServerAdmin webmaster\@$sub->[1]
! DocumentRoot $config{'apache_kdbase'}/$sub->[2]$sub->[3]
! ScriptAlias /cgi-bin/ $config{'apache_kdbase'}/$sub->[2]$sub->[3]/cgi-bin/
! CustomLog $config{'apache_logbasedir'}/$sub->[2]/$sub->[0]_access.log combined
! ErrorLog $config{'apache_logbasedir'}/$sub->[2]/$sub->[0]_error.log
! </VirtualHost>
  EOF
  }
  }
--- 134,159 ----
  sub APACHE
  {
! print "Erstelle Apache Konfiguration...\n"if($config{debug});
! open(APACHE,">$config{apache_conf}");
  &db_open;
! my $sql = qq[SELECT subdomain, domain, kunde, pfad, noapache, apache_add, cgi FROM subdomains];
  $cursor = $dbh->prepare($sql) or die "SELECT failed: $sql";
  $cursor->execute() or die $cursor->errstr;
  while(defined($sub=$cursor->fetch)){
  unless($sub->[4]){
! mkdir "$config{apache_kdbase}/$sub->[2]$sub->[3]" unless -e "$config{apache_kdbase}/$sub->[2]$sub->[3]";
  
  print APACHE<<EOF;
! <VirtualHost $config{ip}:80>
! User $sub->[2]
! Group nogroup
  ServerName $sub->[0]
  ServerAdmin webmaster\@$sub->[1]
! DocumentRoot $config{apache_kdbase}/$sub->[2]$sub->[3]
! CustomLog $config{apache_logbasedir}/$sub->[2]/$sub->[0]_access.log combined
! ErrorLog $config{apache_logbasedir}/$sub->[2]/$sub->[0]_error.log
  EOF
+ print APACHE "ScriptAlias /cgi-bin/ $config{apache_kdbase}/$sub->[2]$sub->[3]/cgi-bin/\n" if($sub->[6]);
+ print APACHE $sub->[5]."\n</VirtualHost>\n";
  }
  }
***************
*** 397,399 ****
  
  
! exit;
\ No newline at end of file
--- 399,401 ----
  
  
! exit;