OFBiz › OFBiz - Commits

svn commit: r1863892 - in /ofbiz/tools/demo-backup: Nicolas/functions.sh README.md check-svn-update.sh old-manual.sh stable-manual.sh trunk.sh

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r1863892 - in /ofbiz/tools/demo-backup: Nicolas/functions.sh README.md check-svn-update.sh old-manual.sh stable-manual.sh trunk.sh

jleroux@apache.org
Author: jleroux
Date: Sun Jul 28 10:36:38 2019
New Revision: 1863892

URL: http://svn.apache.org/viewvc?rev=1863892&view=rev
Log:
Mostly updates README.md after the switch to ofbiz-vm3 (on Amazon)
Also:
 jesse.properties no longer exists in any branch (not sure why we have that)
 we don't use init-gradle-wrapper.sh in demos

Modified:
    ofbiz/tools/demo-backup/Nicolas/functions.sh
    ofbiz/tools/demo-backup/README.md
    ofbiz/tools/demo-backup/check-svn-update.sh
    ofbiz/tools/demo-backup/old-manual.sh
    ofbiz/tools/demo-backup/stable-manual.sh
    ofbiz/tools/demo-backup/trunk.sh

Modified: ofbiz/tools/demo-backup/Nicolas/functions.sh
URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/Nicolas/functions.sh?rev=1863892&r1=1863891&r2=1863892&view=diff
==============================================================================
--- ofbiz/tools/demo-backup/Nicolas/functions.sh (original)
+++ ofbiz/tools/demo-backup/Nicolas/functions.sh Sun Jul 28 10:36:38 2019
@@ -26,9 +26,6 @@ removeUneededFiles() {
     if [ -n "$(ls $OFBIZ_DIR/framework/base/config/*)" ]; then
         rm $OFBIZ_DIR/framework/base/config/*.jks
     fi
-    if [ -r "$OFBIZ_DIR/framework/base/config/jesse.properties" ]; then
-        rm $OFBIZ_DIR/framework/base/config/jesse.properties
-    fi
 }
 
 #apply patch dedicate to demo configuration
@@ -38,10 +35,3 @@ applyPatches () {
         patch -p0 < $2/$i;
     done
 }
-
-#control if gradlew is present, otherwise init it before
-checkGradlew () {
-    if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
-        sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
-    fi
-}
\ No newline at end of file

Modified: ofbiz/tools/demo-backup/README.md
URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/README.md?rev=1863892&r1=1863891&r2=1863892&view=diff
==============================================================================
--- ofbiz/tools/demo-backup/README.md (original)
+++ ofbiz/tools/demo-backup/README.md Sun Jul 28 10:36:38 2019
@@ -1,12 +1,11 @@
-Three instances of OFBiz run on the OFBiz demo VM2 at https://ofbiz-vm2.apache.org.
+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 16.11)
 * old: the previous stable version (currently 13.07)
 
-This is the second instance of VM we use hence the 2 in its domain name.
-The root of https://ofbiz-vm2.apache.org is the so called bigfiles directory
-which is actually at /home/ofbizDemo/big-files
+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.
 
 We own 3 Apache sub domains
 
@@ -15,22 +14,9 @@ We own 3 Apache sub domains
 * https://demo-old.ofbiz.apache.org
 
 The Puppet configuration is at
-https://github.com/apache/infrastructure-puppet/blob/deployment/data/nodes/ofbiz-vm2.apache.org.yaml
-To modify it there is 2 possibilities.
-1. You know what you are doing or have a idea about it:
-    * Create your own fork of https://github.com/apache/infrastructure-puppet/,
-    * make the modifications,
-    * push them,
-    * ask for a Pull Request
-2. You don't know how to change things. Just create an Infra Jira asking for the wanted change...and be patient ;)
-
-To help you here is [the changes history](https://github.com/apache/infrastructure-puppet/commits/deployment/data/nodes/ofbiz-vm2.apache.org.yaml "changes history")
-
->_Note_: To update your fork with command line:
-
-        git fetch upstream
-            If it does not work: git remote add upstream https://github.com/apache/infrastructure-puppet.git
-        git merge upstream/deployment
+https://github.com/apache/infrastructure-p6/blob/production/data/nodes/ofbiz-vm3.apache.org.yaml
+It's currently impossible to directly modify, it's a private Github repo.
+Just create an Infra Jira asking for the wanted change...and be patient ;)
 
 
 >_Note_: **Only run the ofbiz demos using the 'ofbizDemo' user, never run as root.**
@@ -39,7 +25,9 @@ To help you here is [the changes history
 
     sudo -s -u ofbizDemo -H
 
-    sudo uses OTP (One Time Password), so you not only need to be registered as a sudoer (ask Infra) but also to use a tool like Donkey on Ubuntu (jleroux: I use that) to generate the OTP
+    sudo uses OTP*
+    
+    OTP for (One Time Password). You not only need to be registered as a sudoer (ask Infra) but also to use a tool like https://reference.apache.org/committer/otp-md5 to generate the OTP
     Then you can start/stop as required.
 
     To check if the demos are being run as the ofbizDemo user:
@@ -47,15 +35,11 @@ To help you here is [the changes history
     ps aux | grep ofbizDemo
 
     The first column on the left tell you the username the demo is
-    being run as - it should say ofbizDemo (UID) or 9997 (GID) !
+    being run as - it should say ofbizDemo (UID).
 
-    Type 'exit' to exit the ofbizDemo user and return to your normal user.
+    Type 'exit' to exit the ofbizDemo user and return to your username.
 
-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 ofbiz cron job every 24 hours at 3 AM.
-You should therefore only need to start/stop manually if there is
-a problem.
+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.
 
 ~~If you want to restart only a single instance you can respectively use
 trunk-manual-nicely.sh
@@ -65,4 +49,4 @@ This does not work (at least for instanc
 See why at https://issues.apache.org/jira/browse/OFBIZ-10287
 So you need to use trunk-manual-nicely.sh for now and restart all instances even if only one is changed.
 
-
+

Modified: ofbiz/tools/demo-backup/check-svn-update.sh
URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/check-svn-update.sh?rev=1863892&r1=1863891&r2=1863892&view=diff
==============================================================================
--- ofbiz/tools/demo-backup/check-svn-update.sh (original)
+++ ofbiz/tools/demo-backup/check-svn-update.sh Sun Jul 28 10:36:38 2019
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 # Restart each morning at 3
+# for ofbizDemo user
 # crontab -e
 # add : 0 3 * * * nice -n 19 ionice -c2 -n7 /home/ofbizDemo/check-svn-update.sh > /home/ofbizDemo/cronlog-svn-update.log 2>&1
+# to test:  */10 * * * * ....
 
 ./all-manual.sh

Modified: ofbiz/tools/demo-backup/old-manual.sh
URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/old-manual.sh?rev=1863892&r1=1863891&r2=1863892&view=diff
==============================================================================
--- ofbiz/tools/demo-backup/old-manual.sh (original)
+++ ofbiz/tools/demo-backup/old-manual.sh Sun Jul 28 10:36:38 2019
@@ -13,7 +13,6 @@ if [ ! -r "branch13.7-demo.patch" ]; the
 fi
 
 rm /home/ofbizDemo/branch13.7/framework/base/config/*.jks
-rm /home/ofbizDemo/branch13.7/framework/base/config/jesse.properties
 ./ant stop -Dportoffset=20000
 ./ant clean-all
 ./ant load-demo

Modified: ofbiz/tools/demo-backup/stable-manual.sh
URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/stable-manual.sh?rev=1863892&r1=1863891&r2=1863892&view=diff
==============================================================================
--- ofbiz/tools/demo-backup/stable-manual.sh (original)
+++ ofbiz/tools/demo-backup/stable-manual.sh Sun Jul 28 10:36:38 2019
@@ -5,7 +5,6 @@ echo This cant be used alone, see OFBIZ-
 cd /home/ofbizDemo/branch16.11
 svn up
 rm /home/ofbizDemo/branch16.11/framework/base/config/*.jks
-rm /home/ofbizDemo/branch16.11/framework/base/config/jesse.properties
 ./gradlew --no-daemon "ofbiz --shutdown --portoffset 10000"
 ./gradlew --no-daemon cleanAll
 ./gradlew --no-daemon "ofbiz --load-data"

Modified: ofbiz/tools/demo-backup/trunk.sh
URL: http://svn.apache.org/viewvc/ofbiz/tools/demo-backup/trunk.sh?rev=1863892&r1=1863891&r2=1863892&view=diff
==============================================================================
--- ofbiz/tools/demo-backup/trunk.sh (original)
+++ ofbiz/tools/demo-backup/trunk.sh Sun Jul 28 10:36:38 2019
@@ -3,11 +3,6 @@
 cd /home/ofbizDemo/trunk
 svn up
 rm /home/ofbizDemo/trunk/framework/base/config/*.jks
-rm /home/ofbizDemo/trunk/framework/base/config/jesse.properties
-
-if [ ! -r "$OFBIZ_DIR/gradlew" ]; then
-    sh $OFBIZ_DIR/gradle/init-gradle-wrapper.sh
-fi
 
 ./gradlew --no-daemon pullAllPluginsSource
 ./gradlew --no-daemon terminateOfbiz


Free forum by Nabble Edit this page