[LON-CAPA-cvs] cvs: loncom /build lpml_parse.pl doc/loncapafiles loncapafiles.lpml

[raeburn]

raeburn		Mon Jan 10 21:24:36 2011 EDT

  Modified files:              
    /doc/loncapafiles	loncapafiles.lpml 
    /loncom/build	lpml_parse.pl 
  Log:
  - New categoryname: www conf
    - loncaparevs.tab and serverhomeIDs.tab should be owned by www:www but be
      "configurable", i.e., should not be overwritten during install.
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.717 doc/loncapafiles/loncapafiles.lpml:1.718
--- doc/loncapafiles/loncapafiles.lpml:1.717	Sun Jan  9 17:27:44 2011
+++ doc/loncapafiles/loncapafiles.lpml	Mon Jan 10 21:24:33 2011
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.717 2011/01/09 17:27:44 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.718 2011/01/10 21:24:33 raeburn Exp $ -->
 
 <!--
 
@@ -98,6 +98,14 @@
   <chmod dist='default'>0644</chmod><chown dist='default'>root:root</chown>
   <abbreviation>configurable</abbreviation>
 </category>
+<category name="www conf" type="runtime">
+  <chmod dist='default'>0644</chmod><chown dist='default'>www:www</chown>
+  <abbreviation>configurable</abbreviation>
+</category>
+<category name="www conf" type="development">
+  <chmod dist='default'>0644</chmod><chown dist='default'>www:www</chown>
+  <abbreviation>configurable</abbreviation>
+</category>
 <category name="script" type="runtime">
   <chmod dist='default'>0500</chmod><chown dist='default'>www:www</chown>
   <abbreviation>script</abbreviation>
@@ -1498,7 +1506,7 @@
 <file>
   <source>loncom/loncaparevs.tab</source>
   <target dist='default'>home/httpd/lonTabs/loncaparevs.tab</target>
-  <categoryname>www static conf</categoryname>
+  <categoryname>www conf</categoryname>
   <description>
 File holds LON-CAPA version installed on all servers in the LON-CAPA network. Updated
  by loncron. 
@@ -1508,7 +1516,7 @@
 <file>
   <source>loncom/serverhomeIDs.tab</source>
   <target dist='default'>home/httpd/lonTabs/serverhomeIDs.tab</target>
-  <categoryname>www static conf</categoryname>
+  <categoryname>www conf</categoryname>
   <description>
 File holds paired data -- hostname:lonHostID for all servers in the LON-CAPA network (useful for determining which domain should control server settings for a multi-domain server). Updated by loncron.
   </description>
Index: loncom/build/lpml_parse.pl
diff -u loncom/build/lpml_parse.pl:1.55 loncom/build/lpml_parse.pl:1.56
--- loncom/build/lpml_parse.pl:1.55	Sat Jun  2 03:04:51 2007
+++ loncom/build/lpml_parse.pl	Mon Jan 10 21:24:36 2011
@@ -12,7 +12,7 @@
 # The LearningOnline Network with CAPA
 # lpml_parse.pl - Linux Packaging Markup Language parser
 #
-# $Id: lpml_parse.pl,v 1.55 2007/06/02 03:04:51 albertel Exp $
+# $Id: lpml_parse.pl,v 1.56 2011/01/10 21:24:36 raeburn Exp $
 #
 # Written by Scott Harrison, codeharrison@yahoo.com
 #
@@ -1266,7 +1266,8 @@
 #		"$build $status $dependencies" .
 #		"\nEND FILE");
 	}
-	elsif ($mode eq 'install' && $categoryname ne 'conf') {
+	elsif (($mode eq 'install') && (($categoryname ne 'conf') && 
+					($categoryname ne 'www conf'))) {
 	    if ($build) {
 		my $bi=$sourceroot.'/'.$source.';'.$build.';'.
 		    $dependencies;
@@ -1335,7 +1336,8 @@
 	fi
 END
 	}
-	elsif ($mode eq 'configinstall' && $categoryname eq 'conf') {
+	elsif ($mode eq 'configinstall' && (($categoryname eq 'conf') ||
+					    ($categoryname eq 'www conf'))) {
 	    push @configall,$targetroot.'/'.$target;
 	    return $targetroot.'/'.$target.': alwaysrun'."\n".
 		"\t".'@# Compare source with target and intelligently respond'.