--- loncom/build/Makefile	2003/05/19 18:49:42	1.145
+++ loncom/build/Makefile	2007/11/28 17:21:09	1.185.2.1
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.145 2003/05/19 18:49:42 albertel Exp $
+# $Id: Makefile,v 1.185.2.1 2007/11/28 17:21:09 albertel Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -22,7 +22,7 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=0.99.0
+VERSION=2.5.99.0
 # The current working definition for "RELEASE" is: changes not in the software,
 # but in the operating system dependent packaging of the software.  Thus, the
 # generic tarball releases do not need to have a release number specified.
@@ -91,8 +91,9 @@ help_TARGETS:
 	@echo "                          (horizontal testing)"
 	@echo "TEST_web_layer: mimic a login and various vertical actions on "
 	@echo "                a LON-CAPA system"
-	@echo "TEST_hosts_tab: make sure that a loncapa/loncom/hosts.tab"
-	@echo "                file is specified for installation"
+	@echo "TEST_hosts_and_domain_tab: make sure that a "
+	@echo "        loncapa/loncom/hosts.tab and loncapa/loncom/domain.tab"
+	@echo "        file is specified for installation"
 	@echo "TEST_html2ps: test for the presence of html2ps which is needed"
 	@echo "              for making a PDF compilation for pdfdoc"
 	@echo "*** GENERAL TARGETS SUCH AS 'build' AND 'install' ***"
@@ -107,7 +108,8 @@ help_TARGETS:
 	@echo "rawinstall: just install files, links and directories without"
 	@echo "            any bells or whistles (e.g. double-checking"
 	@echo "            configurations, fine-tuning webserver, etc.)"
-	@echo "hosts_tab: install the hosts.tab to the filesystem"
+	@echo "hosts_and_domain_tab: install the hosts.tab and domain.tab" 
+	@echo "                      to the filesystem"
 	@echo "webserverconf: fine-tune the web server configuration;"
 	@echo "               make sure the proper 'Include' statements"
 	@echo "               are appended to httpd.conf"
@@ -117,13 +119,29 @@ help_TARGETS:
 	@echo "         system"
 	@echo "sanitycheck: probe for common errors and recommend fixes to"
 	@echo "             the user"
+	@echo "logcleanup: clean spurious logfile entries"
+	@echo "clean_file_permissions: Remove erroneous keys from the  "
+	@echo "    file_permissions.db"
+	@echo "accesscount_seed: Migrate the access counting mechanism from "
+	@echo "    nohist_reseval.db to nohist_accesscount.db."
+	@echo "modify_config_files: Perform automatic update of the "
+	@echo "    configuration files for yum and MySQL."
+	@echo "ntpcheck: test to see if ntp is installed and running."
+	@echo "html_parser_check: test functionality of HTML::Parser."
+	@echo "math_random_check: test functionality of Math::Random."
+	@echo "cron_lpmlcheck: remove cron file /etc/cron.d/loncapa.lpml."
+	@echo "chkconfig: test runlevels of httpd and loncontrol."
+	@echo "rpmcheck: test to see if rpms known to confict are installed."
+	@echo "wrap_setuid: put a C wrapper around setuid scripts."
 	@echo "updatequery: solicit the user for machine configuration"
 	@echo "             information; to be incorporated during an update"
 	@echo "             procedure (via the UPDATE command)"
 	@echo "postinstall: double-check things after installation"
 	@echo "VERSION: tag the filesystem with version information inside"
-	@echo "         /etc/loncapa-release"
+	@echo "         /etc/loncapa-release and"
+	@echo "         /home/httpd/html/lon-status/version.txt"
 	@echo "aboutVERSION: place version information inside about.html"
+	@echo "              and loncapa_apache.conf"
 	@echo "*** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***"
 	@echo "Makefile.configinstall: generate a Makefile for configuration"
 	@echo "                        files; built dynamically from"
@@ -138,8 +156,9 @@ help_TARGETS:
 	@echo "*** TARGETS FOR OPERATING ON FILESYSTEMS ACROSS THE NETWORK ***"
 	@echo "lpmladm: coordinates username=lpmladm mediated secure shell"
 	@echo "         processes; needed for the NET_* targets"
-	@echo "NET_hosts_tab: install the hosts.tab to a filesystem elsewhere"
-	@echo "               on the network"
+	@echo "NET_hosts_and_domain_tab: install the hosts.tab and domain.tab"
+	@echo "                          to a filesystem elsewhere"
+	@echo "                          on the network"
 	@echo "NET_webserverconf: fine-tune the web server configuration on a"
 	@echo "                   filesystem elsewhere on the network"
 	@echo "NET_rawinstall: launch the rawinstall target on a filesystem"
@@ -237,6 +256,20 @@ TEST_hosts_tab:
 	     exit 1; \
 	fi
 
+TEST_domain_tab:
+	@echo "Testing domain.tab"
+	@if (test -e ../domain.tab); then \
+		echo "there is a defined link or file; assume okay"; \
+	else echo "**** ERROR **** domain.tab not defined!" && \
+	     echo -n "You need to do one of the following within your " && \
+	     echo "CVS repository (cd loncapa/loncom)" && \
+	     echo "   1) ln -s production_domain.tab domain.tab" && \
+	     echo "   2) ln -s development_domain.tab domain.tab" && \
+	     echo "or 3) ln -s rawhide_domain.tab domain.tab" && \
+	     echo "(you most likely want option #1, production_domain.tab)" && \
+	     exit 1; \
+	fi
+
 TEST_html2ps:
 	@if (test -e /usr/local/html2ps/bin/html2ps); then \
 		echo "I can find html2ps; assume okay"; \
@@ -268,7 +301,7 @@ configinstall: Makefile.configinstall
 	if (test "0" = $(NORESTORECONF)); then \
 	perl loncaparestoreconfigurations suffix .lpmlnew; fi
 
-install: buildflag VERSION TEST_hosts_tab Makefile.install Makefile
+install: buildflag VERSION TEST_hosts_tab TEST_domain_tab Makefile.install Makefile
 	echo -n "" > WARNINGS
 	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
 	directories
@@ -278,11 +311,11 @@ install: buildflag VERSION TEST_hosts_ta
 	NORESTORECONF="$(NORESTORECONF)" configinstall
 	make postinstall
 	make warningnote
-	echo "You can run 'make test' to see if your system is ready to go!"
-	echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"
-	echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
-	echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"
-	echo -n "Please see http://install.lon-capa.org/ for more information"
+	@echo "You can now run 'make test' to see if your system is ready to go!"
+#	@echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND"
+#	@echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost"
+#	@echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)"
+#	@echo -n "Please see http://install.lon-capa.org/ for more information"
 
 rawinstall: VERSION Makefile.install Makefile
 	echo -n "" > WARNINGS
@@ -293,35 +326,26 @@ rawinstall: VERSION Makefile.install Mak
 	make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
 	NORESTORECONF="$(NORESTORECONF)" configinstall
 
-hosts_tab: TEST_hosts_tab
+hosts_and_domain_tab: TEST_hosts_tab TEST_domain_tab
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
 	perl xfml_parse.pl $(SOURCE)/doc/loncapafiles/valid_hosts.xfml | \
 	perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \
 	"$(TARGET)" > Makefile.install
 	make -f Makefile.install directories
 	make -f Makefile.install files
-	@echo "If hosts.tab has changed, restart httpd and loncontrol:"
+	@echo "If hosts.tab or domain.tab has changed, restart httpd and loncontrol:"
 	@echo "   /etc/rc.d/init.d/httpd restart"
 	@echo "   /etc/rc.d/init.d/loncontrol restart"
 
 webserverconf:
 	cat $(SOURCE)/doc/loncapafiles/webserver.piml | \
-	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH)
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
 
 # ---------------- Top-level files such as README, UPDATE, CHECKRPMS, and TEST
 vanillatar:
 	# --------------------------- Point UPDATE to the internal make process
-	echo '#!/bin/sh' > $(SOURCE)/UPDATE
-	echo 'touch loncom/build/WARNINGS' >> $(SOURCE)/UPDATE;
-	echo 'ln -s loncom/build/WARNINGS WARNINGS' >> $(SOURCE)/UPDATE;
-	echo 'cd loncom/build; make build' >> $(SOURCE)/UPDATE
-	echo 'make rawinstall' >> $(SOURCE)/UPDATE
-	echo 'make configinstall' >> $(SOURCE)/UPDATE
-	echo 'make updatequery' >> $(SOURCE)/UPDATE
-	echo 'make hosts_tab' >> $(SOURCE)/UPDATE
-	echo 'make postinstall' >> $(SOURCE)/UPDATE
-	echo 'make aboutVERSION' >> $(SOURCE)/UPDATE
-	echo 'make warningnote' >> $(SOURCE)/UPDATE
+	cp  $(SOURCE)/loncom/UPDATE $(SOURCE)/UPDATE
 	# ----------------------------- Point TEST to the internal make process
 	echo '#!/bin/sh' > $(SOURCE)/TEST
 	echo 'cd loncom/build; make test' >> $(SOURCE)/TEST
@@ -333,7 +357,7 @@ vanillatar:
 	chmod a+rx $(SOURCE)/TEST
 	chmod a+rx $(SOURCE)/CHECKRPMS
 	# -------------------------------- Copy README to the vanilla top-level
-	cp -v $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
+	#cp -v $(SOURCE)/doc/shortest_path_redhat7.2.txt $(SOURCE)/README
 
 tardist:
 	make MANIFEST_all
@@ -347,31 +371,94 @@ tardist:
 	fi
 	cp -v $(SOURCE)/loncom/license/about.html \
 	$(SOURCE)/loncom/license/about.html.orig
+	cp -v $(SOURCE)/loncom/loncapa_apache.conf \
+	$(SOURCE)/loncom/loncapa_apache.conf.orig
 	make aboutVERSION
 	cd $(SOURCE); \
 	tar --no-recursion --numeric-owner --files-from MANIFEST \
 	-h -czf $(DIRTARGET).tar.gz 2>tar_WARNINGS || [ "0" == "0" ]
 	mv -v $(SOURCE)/loncom/license/about.html.orig \
 	$(SOURCE)/loncom/license/about.html
+	mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
+	$(SOURCE)/loncom/loncapa_apache.conf
 	cat $(SOURCE)/tar_WARNINGS | \
 	xargs --replace=XXX echo '**** WARNING **** XXX' > WARNINGS
 	rm -f $(SOURCE)/tar_WARNINGS
 	make warningnote
 
+ntpcheck:
+	cat $(SOURCE)/doc/loncapafiles/ntpcheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+html_parser_check:
+	cat $(SOURCE)/doc/loncapafiles/html_parser_check.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+math_random_check:
+	cat $(SOURCE)/doc/loncapafiles/math_random_check.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+cron_lpmlcheck:
+	cat $(SOURCE)/doc/loncapafiles/cron_lpmlcheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+chkconfig:
+	cat $(SOURCE)/doc/loncapafiles/chkconfig.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+rpmcheck:
+	cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 sanitycheck:
 	cat $(SOURCE)/doc/loncapafiles/sanitycheck.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+logcleanup:
+	cat $(SOURCE)/doc/loncapafiles/logcleanup.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 updatequery:
 	cat $(SOURCE)/doc/loncapafiles/updatequery.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
 
+run_searchcat:
+	cat $(SOURCE)/doc/loncapafiles/run_searchcat.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(QUERYLAUNCH)
+
+clean_file_permissions:
+	cat $(SOURCE)/doc/loncapafiles/clean_file_permissions.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+accesscount_seed:
+	cat $(SOURCE)/doc/loncapafiles/accesscount_seed.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+modify_config_files:
+	cat $(SOURCE)/doc/loncapafiles/modify_config_files.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 reseval_fixup:
 	cat $(SOURCE)/doc/loncapafiles/reseval_fixup.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+update_queue_slots:
+	cat $(SOURCE)/doc/loncapafiles/update_queue_slots.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 clearoutoldspreadsheetcache:
 	cat $(SOURCE)/doc/loncapafiles/clearoutoldspreadsheetcache.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -382,24 +469,54 @@ sendmail_fix:
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+ownership_fix:
+	cat $(SOURCE)/doc/loncapafiles/ownership_fix.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
+wrap_setuid:
+	cat $(SOURCE)/doc/loncapafiles/wrap_setuid.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 postinstall:
 	make webserverconf
 	make reseval_fixup
+	make clean_file_permissions
+	make accesscount_seed
+	make update_queue_slots
+	make modify_config_files
 	make clearoutoldspreadsheetcache
+	make chkconfig
+	make rpmcheck
+	make ntpcheck
+	make html_parser_check
+	make cron_lpmlcheck
 	make sanitycheck
+	make logcleanup
 	make sendmail_fix
+	make ownership_fix
+	make wrap_setuid
 
 VERSION:
 	install -d $(TARGET)/etc
 	echo -n "LON-CAPA release $(VERSION)-" > $(TARGET)/etc/loncapa-release
 	date +"%Y%m%d" >> $(TARGET)/etc/loncapa-release
+	install -d $(TARGET)/home/httpd/html/lon-status
+	echo -n "$(VERSION)-" > $(TARGET)/home/httpd/html/lon-status/version.txt
+	date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt
 
 aboutVERSION:
 	cat $(SOURCE)/loncom/license/about.html | \
-	perl -e '$$d=`date +"%Y%m%d"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
+	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
 	$(SOURCE)/loncom/license/about.html.new
 	mv -v $(SOURCE)/loncom/license/about.html.new \
 	$(SOURCE)/loncom/license/about.html
+	cat $(SOURCE)/loncom/loncapa_apache.conf | \
+	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(VERSION)-$$d/; print;}' > \
+	$(SOURCE)/loncom/loncapa_apache.conf.new
+	mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
+	$(SOURCE)/loncom/loncapa_apache.conf
 
 # ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***
 
@@ -451,9 +568,9 @@ lpmladm:
 		echo "**** ERROR **** Incorrect METAMTARGET"; \
 	fi
 
-NET_hosts_tab:
+NET_hosts_and_domain_tab:
 	make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \
-	MTARGET="hosts_tab" HOSTNAME="$(HOSTNAME)" lpmladm
+	MTARGET="hosts_and_domain_tab" HOSTNAME="$(HOSTNAME)" lpmladm
 
 NET_webserverconf:
 	make TIMESTAMP=`date +"%s"` METAMTARGET="LAUNCH" \
@@ -477,6 +594,12 @@ MANIFEST_all:
 	echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST
 	echo 'loncom/production_hosts.tab' >> $(SOURCE)/MANIFEST
 	echo 'loncom/development_hosts.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/production_domain.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/development_domain.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/production_dns_hosts.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/development_dns_hosts.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/production_dns_domain.tab' >> $(SOURCE)/MANIFEST
+	echo 'loncom/development_dns_domain.tab' >> $(SOURCE)/MANIFEST
 	# ------------------ Files needed for dynamically generated directories
 	echo 'doc/man' >> $(SOURCE)/MANIFEST
 	echo 'doc/lib' >> $(SOURCE)/MANIFEST
@@ -502,16 +625,16 @@ MANIFEST_cvs:
 # ------------------- MANIFEST the building, testing and standard loncapa files
 MANIFEST_lpml:
 	cat $(SOURCE)/doc/loncapafiles/buildfiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/testfiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/installfiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 	cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \
-	perl lpml_parse.pl MANIFEST development default \
+	perl lpml_parse.pl MANIFEST development $(DIST) \
 	'$(SOURCE)' '$(TARGET)' | grep '[[:alnum:]]' >> $(SOURCE)/MANIFEST
 
 # ------------ Files for top-level (the vanilla layer that the user first sees)
@@ -609,6 +732,10 @@ BinaryRoot: base_rpm_file_list
 
 # ======================================== *** MASTER DOCUMENTATION TARGETS ***
 
+buildwebsite:
+	cd ../../doc/build; perl ./generate_web_pages.pl
+
+
 # Generates CVS:loncom/build/docs; root location of install.lon-capa.org
 doc:
 	install -d docs
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
<html><head>
<title>500 Internal Server Error</title>
</head><body>
<h1>Internal Server Error</h1>
<p>The server encountered an internal error or
misconfiguration and was unable to complete
your request.</p>
<p>Please contact the server administrator at 
 root@localhost to inform them of the time this error occurred,
 and the actions you performed just before this error.</p>
<p>More information about this error may be available
in the server error log.</p>
</body></html>