This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ofbiz-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 332e828 Improved: Demos upgrade
332e828 is described below
commit 332e82857b7d02a60ff14015c379d241a5b65265
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sat Nov 6 12:16:11 2021 +0100
Improved: Demos upgrade
The stable demo is now running the R18 branch and the old demo R17.
---
demo-backup/README.md | 27 ++++++++++++++++++++-------
demo-backup/old-manual.sh | 26 ++++++++++++++------------
demo-backup/stable-manual.sh | 12 ++++++------
3 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/demo-backup/README.md b/demo-backup/README.md
index a5d441d..a2745cb 100644
--- a/demo-backup/README.md
+++ b/demo-backup/README.md
@@ -2,8 +2,8 @@
Three instances of OFBiz run on the OFBiz demo VM3 at
https://ofbiz-vm3.apache.org.
* trunk: the trunk version
-* stable: the last stable version (currently 17.12)
-* old: the previous stable version (currently 16.11)
+* stable: the last stable version (currently 18.12)
+* old: the previous stable version (currently 17.12)
This is the 3rd instance of VM we use hence the 3 in its domain name.
The root of https://ofbiz-vm3.apache.org is the so called bigfiles directory
which is actually at /var/www/ofbiz/big-files.
@@ -45,6 +45,20 @@ You will need to use OTP (One Time Password). For
documentation on how to use OP
Also note that the demos are usually updated and started/stopped automatically
using the check-svn-update.sh script in this directory. It is run by an
ofbizDemo cron job every 24 hours at 3 AM. You should therefore only need to
start/stop manually if there is a problem.
+## Upgrade stable and old demos
+
+You need first to create a branchAA.mm directory under the ofbizDemo directory
and to clone the related releaseAA.mm in this new directory. Then to copy and
apply the patches contained in the old-manual.sh and stable-manual.sh files,
read the comments in these files for details.
+
+Looking at the Puppet configuration (see above) you will see that you only
need to change the old-manual.sh and stable-manual.sh files to upgrade stable
and old demos. Because they are defined in the Puppet configuration by
respectively
+
+ stable: ProxyPass / ajp://localhost:18009/
+ old : ProxyPass / ajp://localhost:28009/
+
+Finally you need to kill the current stable and old processes before running
again the demos using
+
+ ./all-manual-nicely.sh
+
+
## Letsencrypt certificate update
Every 3 months we need to manually update our Letsencrypt certificate. It was
automated before, it's maybe again but I have no news about it. Anyway, it's
quite easy to do so. Simply connect to the demo VM and run
@@ -61,15 +75,14 @@ I got this message today (2020-04-17):
No renewals were attempted.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
+and always since: it's OK. Nothing to do, it's automated. :)
# Current restriction
~~If you want to restart only a single instance you can respectively use
trunk-manual-nicely.sh
stable-manual-nicely.sh
old-manual-nicely.sh~~
-This does not work, at least for instances using Gradle (currently trunk and
stable, ie R16).
-See why at https://issues.apache.org/jira/browse/OFBIZ-10287
-Hence currently R13.07 is not affected you can use *old-manual-nicely.sh* to
only restart the old demo.
-And you need for now to use *all-manual-nicely.sh* when trunk or/and stable
are affected.
+This does not work.See why at https://issues.apache.org/jira/browse/OFBIZ-10287
+So you need to use ./all-manual-nicely.sh from ofbizDemo
+From time to time (every months?) better to delete nohup.out.
-
diff --git a/demo-backup/old-manual.sh b/demo-backup/old-manual.sh
index 2142924..1a81bdc 100755
--- a/demo-backup/old-manual.sh
+++ b/demo-backup/old-manual.sh
@@ -1,27 +1,29 @@
#!/bin/sh
echo This cant be used alone, see OFBIZ-10287. You need for now to use
all-manual-nicely.sh
-
-cd /home/ofbizDemo/branch16.11
-svn up
-rm /home/ofbizDemo/branch16.11/framework/base/config/*.jks
+cd /home/ofbizDemo/branch17.12
+git pull
+rm /home/ofbizDemo/branch17.12/framework/base/config/*.jks
# I have decided to apply patches once for all. The reason is else they are
# applied once and not later. So it's easier like that.
# If we need to change the patches they will be reverted and applied again.
# Hopefully only when changing stable and old.
+#patch -p0 < /home/ofbizDemo/branch17.12/url.properties.patch
+#patch -p0 < /home/ofbizDemo/branch17.12/fop.xconf.patch
-#patch -p0 < /home/ofbizDemo/branch16.11/url.properties.patch
-#patch -p0 < /home/ofbizDemo/branch16.11/fop.xconf.patch
-#cd /home/ofbizDemo/branch16.11/specialpurpose
-#patch -p0 < /home/ofbizDemo/branch16.11/solr.config.patch
-#cd ..
+#the ones under plugins must be applied each time
+# because pullAllPluginsSource removes the plugins dir
+./gradlew --no-daemon pullAllPluginsSource
+cd /home/ofbizDemo/branch17.12/plugins
+patch -p0 < /home/ofbizDemo/branch17.12/solr.config.patch
+cd ..
./gradlew --no-daemon "ofbiz --shutdown --portoffset 20000"
./gradlew --no-daemon cleanAll
-./gradlew --no-daemon "ofbiz --load-data"
-./gradlew --no-daemon svnInfoFooter
-./gradlew --no-daemon "ofbizBackground --start --portoffset 20000"
\ No newline at end of file
+./gradlew --no-daemon loadAll
+./gradlew --no-daemon gitInfoFooter
+./gradlew --no-daemon "ofbizBackground --start --portoffset 20000"
diff --git a/demo-backup/stable-manual.sh b/demo-backup/stable-manual.sh
index e45c539..70cf2cb 100755
--- a/demo-backup/stable-manual.sh
+++ b/demo-backup/stable-manual.sh
@@ -1,25 +1,25 @@
#!/bin/sh
echo This cant be used alone, see OFBIZ-10287. You need for now to use
all-manual-nicely.sh
-cd /home/ofbizDemo/branch17.12
+cd /home/ofbizDemo/branch18.12
git pull
-rm /home/ofbizDemo/branch17.12/framework/base/config/*.jks
+rm /home/ofbizDemo/branch18.12/framework/base/config/*.jks
# I have decided to apply patches once for all. The reason is else they are
# applied once and not later. So it's easier like that.
# If we need to change the patches they will be reverted and applied again.
# Hopefully only when changing stable and old.
-#patch -p0 < /home/ofbizDemo/branch17.12/url.properties.patch
-#patch -p0 < /home/ofbizDemo/branch17.12/fop.xconf.patch
+#patch -p0 < /home/ofbizDemo/branch18.12/url.properties.patch
+#patch -p0 < /home/ofbizDemo/branch18.12/fop.xconf.patch
#the ones under plugins must be applied each time
# because pullAllPluginsSource removes the plugins dir
./gradlew --no-daemon pullAllPluginsSource
-cd /home/ofbizDemo/branch17.12/plugins
-patch -p0 < /home/ofbizDemo/branch17.12/solr.config.patch
+cd /home/ofbizDemo/branch18.12/plugins
+patch -p0 < /home/ofbizDemo/branch18.12/solr.config.patch
cd ..
./gradlew --no-daemon "ofbiz --shutdown --portoffset 10000"
