[Rt-commit] rt branch, 4.2/auto-clear-mason-cache, created. rt-4.2.2-14-g2d63981

[Alex Vandiver]

The branch, 4.2/auto-clear-mason-cache has been created
        at  2d63981e4fdda6595721313bb0d94539ad83c0e5 (commit)

- Log -----------------------------------------------------------------
commit 6015b0a60575ba59ce6eecae70b12643b2345460
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Feb 4 13:51:39 2014 -0500

    Automatically clean out Mason cache whenever HTML is installed

diff --git a/Makefile.in b/Makefile.in
index ad2b310..f9b6402 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -354,6 +354,11 @@ dirs:
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_LEXICON_PATH)
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(LOCAL_STATIC_PATH)
 
+clean-mason-cache:
+	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/cache/*
+	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/etc/*
+	rm -rf $(DESTDIR)$(MASON_DATA_PATH)/obj/*
+
 install: testdeps config-install dirs files-install fixperms instruct
 
 files-install: libs-install etc-install config-install bin-install sbin-install html-install doc-install font-install po-install static-install
@@ -409,6 +414,7 @@ html-install:
 @COMMENT_INPLACE_LAYOUT@	-( cd share/html && find . -type f -print ) | while read file ; do \
 @COMMENT_INPLACE_LAYOUT@	    $(INSTALL) -m 0644 "share/html/$$file" "$(DESTDIR)$(MASON_HTML_PATH)/$$file" ; \
 @COMMENT_INPLACE_LAYOUT@	done
+ at COMMENT_INPLACE_LAYOUT@	$(MAKE) clean-mason-cache
 
 font-install:
 @COMMENT_INPLACE_LAYOUT@	[ -d $(DESTDIR)$(RT_FONT_PATH) ] || $(INSTALL) -m 0755 -d $(DESTDIR)$(RT_FONT_PATH)
diff --git a/README b/README
index 4bc7114..6618c34 100644
--- a/README
+++ b/README
@@ -169,11 +169,8 @@ GENERAL INSTALLATION
       RT (such as 3.6.4) so that the appropriate set of database
       upgrades can be applied.
 
-      Finally, clear the Mason cache dir:
-
-          rm -fr /opt/rt4/var/mason_data/obj
-
-      You may then start your web server again.
+      If 'make upgrade-database' completes without error, your upgrade
+      has been successful and you may restart your webserver.
 
  7) Configure the web server, as described in docs/web_deployment.pod,
     and the email gateway, as described below.

commit 2d63981e4fdda6595721313bb0d94539ad83c0e5
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Feb 4 13:52:42 2014 -0500

    Cleaning out var/mason after rt-server has been unnecessary since 9e737ee1

diff --git a/docs/web_deployment.pod b/docs/web_deployment.pod
index a5684e0..920c223 100644
--- a/docs/web_deployment.pod
+++ b/docs/web_deployment.pod
@@ -22,12 +22,6 @@ to use L<Starman>, a high performance preforking server:
 
     /opt/rt4/sbin/rt-server --server Starman --port 8080
 
-B<NOTICE>: After you run the standalone server as root, you will need to
-remove your C<var/mason_data> directory, or the non-standalone servers
-(Apache, etc), which run as a non-privileged user, will not be able to
-write to it and will not work.
-
-
 =head2 Apache
 
 B<WARNING>: Both C<mod_speling> and C<mod_cache> are known to break RT.

-----------------------------------------------------------------------