svn commit: r1710885 - in /forrest/zone/config: crontab.txt run-forrestbot.sh setenv-java-16.sh setenv.sh update-forrest-trunk.sh update_check.sh
Author: bdube
Date: Tue Oct 27 20:52:48 2015
New Revision: 1710885
URL: http://svn.apache.org/viewvc?rev=1710885=rev
Log:
Updates for new virtual machine
Modified:
forrest/zone/config/crontab.txt
forrest/zone/config/run-forrestbot.sh
forrest/zone/config/setenv-java-16.sh
forrest/zone/config/setenv.sh
forrest/zone/config/update-forrest-trunk.sh
forrest/zone/config/update_check.sh
Modified: forrest/zone/config/crontab.txt
URL:
http://svn.apache.org/viewvc/forrest/zone/config/crontab.txt?rev=1710885=1710884=1710885=diff
==
--- forrest/zone/config/crontab.txt (original)
+++ forrest/zone/config/crontab.txt Tue Oct 27 20:52:48 2015
@@ -1,16 +1,17 @@
-# Crontab of the Forrest role account user: 'forrest'
+# Crontab of the Forrest role account user: 'forrest_role'
# Do an svn update check every hour at 45 minutes past.
-45 * * * * /home/forrest/config/update_check.sh
+45 * * * * /home/forrest_role/config/update_check.sh
# Run forrestbot jobs every hour.
-04 * * * * /home/forrest/config/run-forrestbot.sh forrest-seed.xml notify trunk
-07 * * * * /home/forrest/config/run-forrestbot.sh forrest-sample-2.xml notify
trunk
-10 * * * * /home/forrest/config/run-forrestbot.sh forrest-docs.xml notify trunk
+04 * * * * /home/forrest_role/config/run-forrestbot.sh forrest-seed.xml notify
trunk
+07 * * * * /home/forrest_role/config/run-forrestbot.sh forrest-sample-2.xml
notify trunk
+10 * * * * /home/forrest_role/config/run-forrestbot.sh forrest-docs.xml notify
trunk
# cleanup old logs
-58 23 * * * find /home/forrest/config/forrestbot-*/logs -name '*.log' -o -name
'*.tar.gz' -mtime +1 | xargs rm -f
-58 23 * * * cd /home/forrest/config; find . \( -type d ! -name . -prune \) -o
\( -name "update-forrest-trunk-*.log" -mtime +1 -print \) | xargs rm -f
+58 23 * * * find /home/forrest_role/config/forrestbot-*/logs -name '*.log'
-mtime +1 | xargs rm -f
+57 23 * * * find /home/forrest_role/config/forrestbot-*/logs -name '*.tar.gz'
-mtime +1 | xargs rm -f
+58 23 * * * cd /home/forrest_role/config; find . \( -type d ! -name . -prune
\) -o \( -name "update-forrest-trunk-*.log" -mtime +1 -print \) | xargs rm -f
# -- EVERYTHING BELOW THIS LINE HAS BEEN DISABLED, NEED TO CHECK WHEN/IF THESE
ENTRIES CAN BE REMOVED --
Modified: forrest/zone/config/run-forrestbot.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/run-forrestbot.sh?rev=1710885=1710884=1710885=diff
==
--- forrest/zone/config/run-forrestbot.sh (original)
+++ forrest/zone/config/run-forrestbot.sh Tue Oct 27 20:52:48 2015
@@ -23,7 +23,7 @@
# - Run the relevant version of forrestbot.
# See also cron which calls this script.
-# The crontab is for the "forrest" user.
+# The crontab is for the "forrest_role" user.
# See copy in SVN at zone/config/crontab.txt
fbVersion=$3
@@ -51,11 +51,11 @@ END
;;
esac
-export CONFIG=/home/forrest/config
+export CONFIG=/home/forrest_role/config
source ${CONFIG}/setenv.sh
source ${CONFIG}/setenv-java-16.sh
-export FORREST_HOME=/home/forrest/sources/forrest-$fbVersion
+export FORREST_HOME=/home/forrest_role/sources/forrest-$fbVersion
export FORRESTBOT_HOME=${CONFIG}/forrestbot-$fbVersion
export PATH=${PATH}:${FORREST_HOME}/bin
umask 0002
Modified: forrest/zone/config/setenv-java-16.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/setenv-java-16.sh?rev=1710885=1710884=1710885=diff
==
--- forrest/zone/config/setenv-java-16.sh (original)
+++ forrest/zone/config/setenv-java-16.sh Tue Oct 27 20:52:48 2015
@@ -19,6 +19,7 @@
# Java 1.6
#export JAVA_HOME=/usr/local/diablo-jdk1.6.0
#export JAVA_HOME=/usr/local/jdk1.6.0
-export JAVA_HOME=/usr/local/openjdk6
+#export JAVA_HOME=/usr/local/openjdk6
+export JAVA_HOME=/usr/lib/jvm/java-6-openjdk-amd64
export PATH=${JAVA_HOME}/bin:${PATH}
Modified: forrest/zone/config/setenv.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/setenv.sh?rev=1710885=1710884=1710885=diff
==
--- forrest/zone/config/setenv.sh (original)
+++ forrest/zone/config/setenv.sh Tue Oct 27 20:52:48 2015
@@ -17,7 +17,7 @@
export SHELL=/bin/bash
-export DOC_ROOT=/usr/local/www/apache22/data
-export CONFIG=/home/forrest/config
+export DOC_ROOT=/home/forrest_role/htdocs
+export CONFIG=/home/forrest_role/config
export LANG=en_US.UTF-8
export PATH=${PATH}:/usr/local/bin
Modified: forrest/zone/config/update-forrest-trunk.sh
URL:
http://svn.apache.org/viewvc/forrest/zone/config/update-forrest-trunk.sh?rev=1710885=1710884=1710885=diff
==
--- forrest/zone/config/update-forrest-trunk.sh (original)
+++ forrest/zone/config/update-forrest-trunk.sh Tue Oct 27 20:52:48 2015
@@
svn commit: r1710888 - /forrest/zone/htdocs/index.html
Author: bdube Date: Tue Oct 27 21:11:44 2015 New Revision: 1710888 URL: http://svn.apache.org/viewvc?rev=1710888=rev Log: Note current hostname on vm page The old zone has been configured to redirect to the new host. When the old zone is finally switched off we can revisit DNS names. Modified: forrest/zone/htdocs/index.html Modified: forrest/zone/htdocs/index.html URL: http://svn.apache.org/viewvc/forrest/zone/htdocs/index.html?rev=1710888=1710887=1710888=diff == --- forrest/zone/htdocs/index.html (original) +++ forrest/zone/htdocs/index.html Tue Oct 27 21:11:44 2015 @@ -25,7 +25,7 @@ -forrest.zones.apache.org +forrest.zones.apache.org (currently forrest-vm.apache.org) Note: The official Apache Forrest website is at
svn commit: r1710909 - in /forrest/site: ./ docs_0_100/ dtdx/ skin/images/
Author: bdube
Date: Tue Oct 27 23:51:30 2015
New Revision: 1710909
URL: http://svn.apache.org/viewvc?rev=1710909=rev
Log:
Publish from forrestbot
Modified:
forrest/site/abs-linkmap
forrest/site/abs-menulinks
forrest/site/committed-1.png
forrest/site/docs_0_100/upgrading_010.html
forrest/site/docs_0_100/your-project.html
forrest/site/dtdx/document-v13.pdf
forrest/site/dtdx/document-v20.pdf
forrest/site/skin/images/rc-b-l-15-1body-2menu-3menu.png
forrest/site/skin/images/rc-b-r-15-1body-2menu-3menu.png
forrest/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
forrest/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
forrest/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
forrest/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
forrest/site/skin/images/rc-t-r-15-1body-2menu-3menu.png
forrest/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
forrest/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
forrest/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.png
forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.test.png
forrest/site/zone.html
Modified: forrest/site/abs-linkmap
URL:
http://svn.apache.org/viewvc/forrest/site/abs-linkmap?rev=1710909=1710908=1710909=diff
==
--- forrest/site/abs-linkmap (original)
+++ forrest/site/abs-linkmap Tue Oct 27 23:51:30 2015
@@ -150,10 +150,13 @@
-http://forrest.zones.apache.org/;>
- http://forrest.zones.apache.org/ft/build/forrest-seed/;>
-http://forrest.zones.apache.org/ft/build/forrest-seed/samples-b/xml-entities.html"/>
+http://forrest-vm.apache.org/;>
+ http://forrest-vm.apache.org/ft/build/forrest-seed/;>
+http://forrest-vm.apache.org/ft/build/forrest-seed/samples-b/xml-entities.html"/>
+ https://puppetlabs.com/"/>
+ https://svn.apache.org/repos/asf/forrest/zone/"/>
+ https://www.apache.org/dev/freebsd-jails#opie"/>
http://java.sun.com/;>
http://java.sun.com/j2ee/;>
Modified: forrest/site/abs-menulinks
URL:
http://svn.apache.org/viewvc/forrest/site/abs-menulinks?rev=1710909=1710908=1710909=diff
==
--- forrest/site/abs-menulinks (original)
+++ forrest/site/abs-menulinks Tue Oct 27 23:51:30 2015
@@ -150,10 +150,13 @@
-http://forrest.zones.apache.org/;>
- http://forrest.zones.apache.org/ft/build/forrest-seed/;>
-http://forrest.zones.apache.org/ft/build/forrest-seed/samples-b/xml-entities.html"/>
+http://forrest-vm.apache.org/;>
+ http://forrest-vm.apache.org/ft/build/forrest-seed/;>
+http://forrest-vm.apache.org/ft/build/forrest-seed/samples-b/xml-entities.html"/>
+ https://puppetlabs.com/"/>
+ https://svn.apache.org/repos/asf/forrest/zone/"/>
+ https://www.apache.org/dev/freebsd-jails#opie"/>
http://java.sun.com/;>
http://java.sun.com/j2ee/;>
Modified: forrest/site/committed-1.png
URL:
http://svn.apache.org/viewvc/forrest/site/committed-1.png?rev=1710909=1710908=1710909=diff
==
Binary files - no diff available.
Modified: forrest/site/docs_0_100/upgrading_010.html
URL:
http://svn.apache.org/viewvc/forrest/site/docs_0_100/upgrading_010.html?rev=1710909=1710908=1710909=diff
==
--- forrest/site/docs_0_100/upgrading_010.html (original)
+++ forrest/site/docs_0_100/upgrading_010.html Tue Oct 27 23:51:30 2015
@@ -438,7 +438,7 @@ document.write("Last Published: " + docu
Other configuration files should also be synchronised with the default
files which you copied. For example, a project
Catalog Entity Resolver or symbols entities (see
-http://forrest.zones.apache.org/ft/build/forrest-seed/samples-b/xml-entities.html;>notes).
+http://forrest-vm.apache.org/ft/build/forrest-seed/samples-b/xml-entities.html;>notes).
Other potentional files that you might be using are:
the Apache Cocoon
cli.xconf
Modified: forrest/site/docs_0_100/your-project.html
URL:
http://svn.apache.org/viewvc/forrest/site/docs_0_100/your-project.html?rev=1710909=1710908=1710909=diff
==
--- forrest/site/docs_0_100/your-project.html (original)
+++ forrest/site/docs_0_100/your-project.html Tue Oct 27 23:51:30 2015
@@ -1739,7 +1739,7 @@ project.skinconf=${project.content-dir}/
-SVN: $Revision: 1134318 $ $Date: 2011-06-10 23:25:48
+1000 (Fri, 10 Jun 2011) $
+SVN: $Revision$ $Date$
svn commit: r1710906 - in /forrest/trunk/site-author/content/xdocs: site.xml zone.xml
Author: bdube Date: Tue Oct 27 23:37:36 2015 New Revision: 1710906 URL: http://svn.apache.org/viewvc?rev=1710906=rev Log: FOR-1254: Update old zone notes for new virtual machine Modified: forrest/trunk/site-author/content/xdocs/site.xml forrest/trunk/site-author/content/xdocs/zone.xml Modified: forrest/trunk/site-author/content/xdocs/site.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/site.xml?rev=1710906=1710905=1710906=diff == --- forrest/trunk/site-author/content/xdocs/site.xml (original) +++ forrest/trunk/site-author/content/xdocs/site.xml Tue Oct 27 23:37:36 2015 @@ -183,10 +183,13 @@ -http://forrest.zones.apache.org/;> +http://forrest-vm.apache.org/;> + https://puppetlabs.com/"/> + https://svn.apache.org/repos/asf/forrest/zone/"/> + https://www.apache.org/dev/freebsd-jails#opie"/> http://java.sun.com/;> Modified: forrest/trunk/site-author/content/xdocs/zone.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/zone.xml?rev=1710906=1710905=1710906=diff == --- forrest/trunk/site-author/content/xdocs/zone.xml (original) +++ forrest/trunk/site-author/content/xdocs/zone.xml Tue Oct 27 23:37:36 2015 @@ -24,34 +24,62 @@ Overview -The server forrest.zones.apache.org +Note the current hostname is forrest-vm.apache.org. Links in this +text have been updated but not all uses of the name forrest.zones.apache.org. + + +The server forrest-vm.apache.org provides our testing and demonstration area. It is managed by Apache Forrest committers. The material is intended for developer use only. - -These notes are for our previous zone on the Solaris OS. -Much of this documentation will just need some tweaking. -The new zone (jail) -http://www.apache.org/dev/freebsd-jails.html;>documentation -needs to be referenced. - Configuration Configuration files and directory structures are stored in SVN at -https://svn.apache.org/repos/asf/forrest/zone and +https://svn.apache.org/repos/asf/forrest/zone and additional private stuff is in our pmc/forrest/zone SVN. -Other notes are in SVN at +The current environment is a virtual machine provisioned using +configuration information stored in puppet. + + +Basic configuration classes and settings + + + https://github.com/apache/infrastructure-puppet/blob/deployment/data/nodes/forrest-vm.apache.org.yaml;> +data/nodes/forrest-vm.apache.org.yaml + + + +Manifest to create role account and install extra packages + + + https://github.com/apache/infrastructure-puppet/blob/deployment/modules/forrest_pvm_asf/manifests/init.pp;> +modules/forrest_pvm_asf/manifests/init.pp + + + + + +Configuration changes may be applied by submitting a +https://help.github.com/articles/using-pull-requests/;>pull request. +Fork the https://github.com/apache/infrastructure-puppet;>repository, +make your changes on a topic branch based on deployment branch, and submit your request. + + +Other (old) notes are in SVN at http://svn.apache.org/repos/asf/forrest/zone/README.txt;>zone/README.txt +Note that the user account forrest is now a role account named forrest_role. + + config -creates /home/forrest/config ... $CONFIG +creates /home/forrest_role/config ... $CONFIG directories /forrestbot-*/ are the forrestbot homes, see below. setenv*.sh ... these are sourced by the forrestbots and other cronjobs and user configs, to set the environment. @@ -60,7 +88,7 @@ setenv*.sh ... these are sourced by the htdocs -creates /home/forrest/htdocs ... $DOC_ROOT +creates /home/forrest_role/htdocs ... $DOC_ROOT directories /ft/ and /fts/ are the forrestbot config and results, see below. @@ -72,34 +100,15 @@ Normally these would be in the relevant Hold them here until building properly. -All files are owned in the group "other" so any one of us can -edit/update. Make sure that your 'umask' is set properly so that new -files have group write permissions. See the -notes about user administration. FIXME: Add a -proper group. - - Cron runs the various Forrestbots and management tasks, such as updating -the forrest-trunk software; cleaning up old
svn commit: r1710922 - /forrest/trunk/site-author/content/xdocs/zone.xml
Author: crossley Date: Wed Oct 28 01:50:25 2015 New Revision: 1710922 URL: http://svn.apache.org/viewvc?rev=1710922=rev Log: Minor text tweak. Modified: forrest/trunk/site-author/content/xdocs/zone.xml Modified: forrest/trunk/site-author/content/xdocs/zone.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/zone.xml?rev=1710922=1710921=1710922=diff == --- forrest/trunk/site-author/content/xdocs/zone.xml (original) +++ forrest/trunk/site-author/content/xdocs/zone.xml Wed Oct 28 01:50:25 2015 @@ -42,7 +42,7 @@ The current environment is a virtual machine provisioned using -configuration information stored in puppet. +configuration information stored using Puppet. Basic configuration classes and settings
svn commit: r1710929 - in /forrest/site: ./ docs_0_100/ dtdx/ skin/images/
Author: crossley
Date: Wed Oct 28 02:53:31 2015
New Revision: 1710929
URL: http://svn.apache.org/viewvc?rev=1710929=rev
Log:
Publish from forrestbot
Modified:
forrest/site/committed-1.png
forrest/site/docs_0_100/your-project.html
forrest/site/dtdx/document-v13.pdf
forrest/site/dtdx/document-v20.pdf
forrest/site/skin/images/rc-b-l-15-1body-2menu-3menu.png
forrest/site/skin/images/rc-b-r-15-1body-2menu-3menu.png
forrest/site/skin/images/rc-b-r-5-1header-2tab-selected-3tab-selected.png
forrest/site/skin/images/rc-t-l-5-1header-2searchbox-3searchbox.png
forrest/site/skin/images/rc-t-l-5-1header-2tab-selected-3tab-selected.png
forrest/site/skin/images/rc-t-l-5-1header-2tab-unselected-3tab-unselected.png
forrest/site/skin/images/rc-t-r-15-1body-2menu-3menu.png
forrest/site/skin/images/rc-t-r-5-1header-2searchbox-3searchbox.png
forrest/site/skin/images/rc-t-r-5-1header-2tab-selected-3tab-selected.png
forrest/site/skin/images/rc-t-r-5-1header-2tab-unselected-3tab-unselected.png
forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.png
forrest/site/skin/images/rc-t-r-50-1body-2menu-3menu.test.png
forrest/site/zone.html
Modified: forrest/site/committed-1.png
URL:
http://svn.apache.org/viewvc/forrest/site/committed-1.png?rev=1710929=1710928=1710929=diff
==
Binary files - no diff available.
Modified: forrest/site/docs_0_100/your-project.html
URL:
http://svn.apache.org/viewvc/forrest/site/docs_0_100/your-project.html?rev=1710929=1710928=1710929=diff
==
--- forrest/site/docs_0_100/your-project.html (original)
+++ forrest/site/docs_0_100/your-project.html Wed Oct 28 02:53:31 2015
@@ -1739,7 +1739,7 @@ project.skinconf=${project.content-dir}/
-SVN: $Revision$ $Date$
+SVN: $Revision: 1134318 $ $Date: 2011-06-10 23:25:48
+1000 (Fri, 10 Jun 2011) $
svn commit: r1710927 - /forrest/trunk/site-author/content/xdocs/zone.xml
Author: crossley Date: Wed Oct 28 02:50:15 2015 New Revision: 1710927 URL: http://svn.apache.org/viewvc?rev=1710927=rev Log: Minor text tweak. Modified: forrest/trunk/site-author/content/xdocs/zone.xml Modified: forrest/trunk/site-author/content/xdocs/zone.xml URL: http://svn.apache.org/viewvc/forrest/trunk/site-author/content/xdocs/zone.xml?rev=1710927=1710926=1710927=diff == --- forrest/trunk/site-author/content/xdocs/zone.xml (original) +++ forrest/trunk/site-author/content/xdocs/zone.xml Wed Oct 28 02:50:15 2015 @@ -108,7 +108,7 @@ Hold them here until building properly. Software -Installed software is now managed via puppet, see above. +Installed software is now managed via Puppet, see above. Forrest
