r812 - scripts/trunk

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Dec 25 05:40:00 PST 2006


Author: jhuntwork
Date: 2006-12-25 06:40:00 -0700 (Mon, 25 Dec 2006)
New Revision: 812

Modified:
   scripts/trunk/update-website.mk
Log:
Updates to the update-website.mk script - new locations on new server

Modified: scripts/trunk/update-website.mk
===================================================================
--- scripts/trunk/update-website.mk	2006-12-09 20:38:57 UTC (rev 811)
+++ scripts/trunk/update-website.mk	2006-12-25 13:40:00 UTC (rev 812)
@@ -22,7 +22,7 @@
 WWW_WC = $(PWD)
 
 # Website location (defined on the Subversion hook script)
-#TARGETDIR = /home/httpd/www.linuxfromscratch.org
+#TARGETDIR = /srv/www/www.linuxfromscratch.org
 
 SCRIPTS = $(WWW_WC)/scripts
 TEMPLATES = $(WWW_WC)/templates
@@ -52,10 +52,10 @@
 	svn -q checkout $(SVN)/www2/templates/trunk $(TEMPLATES)
 	mkdir -p $(WWW_WC)/patches/downloads
 	svn -q checkout $(SVN)/patches/trunk $(WWW_WC)/patches/downloads
-	mkdir -p $(WWW_WC)/hints/downloads/files
+	install -g lfswww -m 775 -d $(WWW_WC)/hints/downloads/files
 	svn -q checkout $(SVN)/hints/trunk $(WWW_WC)/hints/downloads/files
 	ln -s files/ATTACHMENTS $(WWW_WC)/hints/downloads/attachments
-	mkdir -p $(WWW_WC)/logs
+	install -g lfswww -m 775 -d $(WWW_WC)/logs
 
 svnlog-%:
 	$(SVNLOG) $(SVN)/$* 2>/dev/null | $(SVN2HTML) --with-branchname > logs/$*.html
@@ -77,7 +77,7 @@
 # TODO: These rules should be run by each project's post-commit script or by
 # cron jobs
 
-LFS_SEARCH = /home/httpd/search.linuxfromscratch.org
+LFS_SEARCH = /srv/www/search.linuxfromscratch.org
 
 update-alfs: svnlog2-ALFS alfs/feed.rss
 # Temporary sync of alfs-srs until a more permanent location/rendering is set up.
@@ -102,7 +102,8 @@
 update-patches: svnlog-patches patches/feed.rss
 	svn -q update patches/downloads -r $(REV)
 
-update-www: svn-www svnlog-www2 feed.rss error-pages update-swish
+update-www: svn-www svnlog-www2 feed.rss error-pages
+#update-swish
 
 update-scripts:
 	svn -q update $(SCRIPTS) -r $(REV)
@@ -137,9 +138,9 @@
 	cd hints && $(SCRIPTS)/genlist.sh
 
 # Apache's error pages
-error-pages: /home/httpd/error/403.html /home/httpd/error/404.html
+error-pages: /srv/www/error/403.html /srv/www/error/404.html
 
-/home/httpd/error/40%.html: 40%.html
+/srv/www/error/40%.html: 40%.html
 	-mv -f $@ $@.old
 	cp -p $< $@
 
@@ -185,4 +186,4 @@
 	mkdir -p timestamp
 	date +%s > timestamp/timestamp
 
-.PHONY: /home/httpd/error/403.html /home/httpd/error/404.html
+.PHONY: /srv/www/error/403.html /srv/www/error/404.html




More information about the website mailing list