--- doc/loncapafiles/webserver.piml	2005/10/10 02:30:46	1.18
+++ doc/loncapafiles/webserver.piml	2014/05/03 15:31:17	1.38
@@ -2,7 +2,7 @@
 	"http://lpml.sourceforge.net/DTD/piml.dtd">
 <!-- webserver.piml -->
 
-<!-- $Id: webserver.piml,v 1.18 2005/10/10 02:30:46 raeburn Exp $ -->
+<!-- $Id: webserver.piml,v 1.38 2014/05/03 15:31:17 raeburn Exp $ -->
 
 <!--
 
@@ -45,19 +45,32 @@ http://www.lon-capa.org/
 <files>
 <file>
 <target dist='default'>/etc/httpd/conf/httpd.conf</target>
-<note>This is for Apache 1.X for Red Hat and Fedora distributions</note>
+<target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1'>/etc/apache2/default-server.conf</target>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14'>/etc/apache2/sites-available/loncapa</target>
+<note>This is for Apache 1.X for Red Hat 4ES, Fedora 2, 3 and 4, SusSE 9.2 and 9.3, and SLES 9 distributions. This is for Apache 2.X for Fedora 5, Red Hat 5, CentOS 5, Scientific Linux 5, SuSE 10.1, SLES 10, Debian 5, Ubuntu LTS 8 and later distributions</note>
 <dependencies dist='default'>
 /etc/httpd/conf/httpd.conf
 </dependencies>
-<perlscript mode='fg'>
+<dependencies dist='suse9.2 suse9.3 sles9'>
+/etc/httpd/httpd.conf
+</dependencies>
+<dependencies dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 ubuntu14'>
+/etc/apache2/sites-available/loncapa
+</dependencies>
+<dependencies dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 suse12.2 suse12.3 suse13.1'>
+/etc/apache2/default-server.conf
+</dependencies>
+<perlscript mode='fg' dist="default">
 # Generated from doc/loncapafiles/webserver.piml
 unless (-e "<TARGET />") {
-  print '**** ERROR! /etc/httpd/conf/httpd.conf should exist! Are you missing the Apache '.
+  print '**** ERROR! <TARGET /> should exist! Are you missing the Apache '.
     'software package?';
   exit(1);
 }
 else {
-  # Append loncapa_apache.conf inclusion to httpd.conf if not present.
+  # Append loncapa_apache.conf inclusion to httpd.conf 
+  # (or sites-available/loncapa) if not present.
   $flag=0;
   open(IN,'&lt;<TARGET />');
   while (&lt;IN&gt;) { 
@@ -114,97 +127,69 @@ else {
   }
   close(IN);
   if ($scriptalias_flag==1) {
-    print('**** ERROR **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.
-          'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
-          'This conflicts with loncapa_apache.conf.'."\n");
-  }
-  if ($documentroot_flag==1) {
-    print('**** ERROR **** /etc/httpd/conf/httpd.conf has an overlapping definition of '.
-          'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
-          'This conflicts with loncapa_apache.conf.'."\n");
-  }
-}
-</perlscript>
-<target dist='suse9.2 suse9.3 sles9'>/etc/httpd/httpd.conf</target>
-<note>This is for Apache 1.X for SuSE distributions</note>
-<dependencies dist='suse9.2 suse9.3 sles9'>
-/etc/httpd/httpd.conf
-</dependencies>
-<perlscript mode='fg' dist='suse9.2 suse9.3 sles9'>
-# Generated from doc/loncapafiles/webserver.piml
-# Trying to check for overlapping DocumentRoot or ScriptAlias definitions.
-unless (-e "<TARGET />") {
-  print '**** ERROR **** /etc/httpd/httpd.conf should exist! Are you missing the Apache '.
-    'software package?';
-  exit(1);
-}
-else {
-  # Append loncapa_apache.conf inclusion to httpd.conf if not present.
-  $flag=0;
-  open(IN,'&lt;<TARGET />');
-  while (&lt;IN&gt;) {
-    if (/^\s*Include\s+conf\/loncapa_apache.conf/) {
-      $flag=1;
-    }
-  }
-  close(IN);
-  unless ($flag==1) {
-    open(OUT,'&gt;&gt;<TARGET />');
-    print(OUT 'Include conf/loncapa_apache.conf'."\n");
-    close(OUT);
-  }
-  # Remove loncapa.conf inclusion from httpd.conf if present.
-  $flag=0;
-  open(IN,'&lt;<TARGET />');
-  while (&lt;IN&gt;) {
-    if (/^\s*Include\s+conf\/loncapa.conf/) {
-      $flag=1;
-    }
-  }
-  close(IN);
-  $in='';
-  if ($flag==1) {
-    open(IN,'&lt;<TARGET />');
-    while(&lt;IN&gt;) {
-      $in.=$_ unless /^\s*Include\s+conf\/loncapa.conf/;
-    }
-    close(IN);
-    open(OUT,'&gt;<TARGET />');
-    print(OUT $in."\n");
-    close(OUT);
-  }
-
-  # Checking for overlapping ScriptAlias and DocumentRoot definitions.
-  $scriptalias_flag=0;
-  $documentroot_flag=0;
-  my $scriptalias;
-  my $documentroot;
-  open(IN,'&lt;<TARGET />');
-  while (&lt;IN&gt;) { 
-    if (m!^\s*ScriptAlias\s+/cgi-bin/\s+(.*)$!) {
-      $scriptalias = $1;
-      if ($scriptalias !~ m!home/httpd/cgi-bin!) {
-	$scriptalias_flag = 1;
-      }
-    }
-    if (m!^\s*DocumentRoot\s+(.*)$!) {
-      $documentroot = $1;
-      if ($documentroot !~ m!home/httpd/html!) {
-	$documentroot_flag = 1;
+      my $conffile = '/etc/httpd/conf/httpd.conf';
+      if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3' 
+          || '<DIST />' eq 'sles9') {
+          $conffile =  '/etc/httpd/httpd.conf';
+      } elsif ('<DIST />' =~ /^(suse|sles)/) {
+          $conffile = '/etc/apache2/default-server.conf';
+      } elsif ('<DIST />' =~ /^(debian|ubuntu)/) {
+          $conffile = '/etc/apache2/sites-available/loncapa';
       }
-    }
-  }
-  close(IN);
-  if ($scriptalias_flag==1) {
-    print('**** ERROR **** /etc/httpd/httpd.conf has an overlapping definition of '.
-          'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
-	  'This conflicts with conf/loncapa_apache.conf.'."\n");
+      print('**** ERROR **** '.$conffile.' has an overlapping definition of '.
+            'ScriptAlias (it is incorrectly set to '.$scriptalias.').'."\n".
+            'This conflicts with loncapa_apache.conf.'."\n");
   }
   if ($documentroot_flag==1) {
-    print('**** ERROR **** /etc/httpd/httpd.conf has an overlapping definition of '.
-          'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
-	  'This conflicts with conf/loncapa_apache.conf.'."\n");
-  }
+      print('**** ERROR **** '.$conffile.' has an overlapping definition of '.
+            'DocumentRoot (it is incorrectly set to '.$documentroot.').'."\n".
+            'This conflicts with loncapa_apache.conf.'."\n");
+  }
+
+# Checking for rewrites of http:// to https://
+    my $rewrite_dir = '/etc/httpd/conf/rewrites';
+    my $curr_rewrite = '/etc/httpd/conf/loncapa_rewrite.conf';
+    if ('<DIST />' eq 'suse9.2' || '<DIST />' eq 'suse9.3'
+        || '<DIST />' eq 'sles9') {
+        $rewrite_dir = '/etc/httpd/rewrites/';
+        $curr_rewrite = '/etc/httpd/loncapa_rewrite.conf';
+    } elsif ('<DIST />' =~ /^(suse|sles|debian|ubuntu)/) {
+        $rewrite_dir = '/etc/apache2/rewrites';
+        $curr_rewrite = '/etc/apache2/loncapa_rewrite.conf';
+    }
+    my $rewrite_off = $rewrite_dir.'/loncapa_rewrite_off.conf';
+    my $rewrite_on = $rewrite_dir.'/loncapa_rewrite_on.conf';
+    if (!-e $curr_rewrite) { 
+        system("cp $rewrite_off $curr_rewrite");
+        chmod(0644, $curr_rewrite);
+    } else {
+        my ($not_rewrite_on,$not_rewrite_off);
+        if (open(PIPE, "diff --brief $rewrite_off $curr_rewrite |")) {
+            my $diffres = &lt;PIPE&gt; ;
+            close(PIPE);
+            chomp($diffres);
+            if ($diffres) {
+                $not_rewrite_off = 1;
+            }
+        }
+        if (open(PIPE, "diff --brief $rewrite_on $curr_rewrite |")) {
+            my $diffres = &lt;PIPE&gt; ;
+            close(PIPE);
+            chomp($diffres);
+            if ($diffres) {
+                $not_rewrite_on = 1;
+            }
+        }
+        unless ($not_rewrite_off || $not_rewrite_on) {
+            print('**** WARNING **** '.$curr_rewrite.' does not match '.
+            'either: '.$rewrite_on.' - the file used to enable rewriting '.
+            'of requests for http:// to https:// or: '.$rewrite_off.
+            ' - the file used to disable such rewriting'."\n\n".
+            'This may be because '. $curr_rewrite.' has been '. 
+            'previously customized, or it may be because of a change '.  
+            'to the files in '.$rewrite_dir."\n");
+        }
+    }
 }
 </perlscript>
 </file>