You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by du...@apache.org on 2018/06/21 14:16:48 UTC
[1/4] brooklyn-docs git commit: Use the official AWS CLI instead of
s3cmd
Repository: brooklyn-docs
Updated Branches:
refs/heads/master f63a2dcb3 -> 29c11688a
Use the official AWS CLI instead of s3cmd
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/60b3f515
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/60b3f515
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/60b3f515
Branch: refs/heads/master
Commit: 60b3f515adf46515bc16f6857ffdabcc13eec82f
Parents: e066c9c
Author: Thomas Bouron <tb...@gmail.com>
Authored: Thu Jun 21 14:40:27 2018 +0100
Committer: GitHub <no...@github.com>
Committed: Thu Jun 21 14:40:27 2018 +0100
----------------------------------------------------------------------
guide/ops/persistence/index.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/60b3f515/guide/ops/persistence/index.md
----------------------------------------------------------------------
diff --git a/guide/ops/persistence/index.md b/guide/ops/persistence/index.md
index 5cefa85..18d7f6f 100644
--- a/guide/ops/persistence/index.md
+++ b/guide/ops/persistence/index.md
@@ -230,8 +230,8 @@ An example script to be invoked by CRON is shown below:
DATA_DIR=/path/to/base/dir/data
tar --exclude '*/backups/*' -czvf $BACKUP_FILENAME $DATA_DIR
- # For s3cmd installation see http://s3tools.org/repositories
- s3cmd put $BACKUP_FILENAME s3://mybackupbucket
+ # For AWS CLI installation see https://aws.amazon.com/cli
+ aws s3 cp $BACKUP_FILENAME s3://mybackupbucket
rm $BACKUP_FILENAME
@@ -255,7 +255,7 @@ An example script to be invoked by CRON is shown below:
--destinationDir $TEMP_DATA_DIR
tar --exclude '*/backups/*' -czvf $BACKUP_FILENAME $TEMP_DATA_DIR
- # For s3cmd installation see http://s3tools.org/repositories
- s3cmd put $BACKUP_FILENAME s3://mybackupbucket
+ # For AWS CLI installation see https://aws.amazon.com/cli
+ aws s3 cp $BACKUP_FILENAME s3://mybackupbucket
rm $BACKUP_FILENAME
rm -r $TEMP_DATA_DIR
[2/4] brooklyn-docs git commit: Merge branch 'master' into patch-7
Posted by du...@apache.org.
Merge branch 'master' into patch-7
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/ce557de1
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/ce557de1
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/ce557de1
Branch: refs/heads/master
Commit: ce557de103bd80e431046443d350a1bd527404cb
Parents: 60b3f51 f63a2dc
Author: Thomas Bouron <tb...@gmail.com>
Authored: Thu Jun 21 15:13:37 2018 +0100
Committer: GitHub <no...@github.com>
Committed: Thu Jun 21 15:13:37 2018 +0100
----------------------------------------------------------------------
guide/blueprints/winrm/index.md | 23 ++++++++++++++++++++++
guide/ops/configuration/brooklyn_cfg.md | 6 +++---
guide/ops/persistence/index.md | 17 ++++++++--------
guide/ops/troubleshooting/connectivity.md | 4 ++--
guide/ops/troubleshooting/deployment.md | 24 +++++++++++++++++++++++
guide/ops/troubleshooting/softwareprocess.md | 5 +++--
6 files changed, 64 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/ce557de1/guide/ops/persistence/index.md
----------------------------------------------------------------------
diff --cc guide/ops/persistence/index.md
index 18d7f6f,b2f52ae..f98914f
--- a/guide/ops/persistence/index.md
+++ b/guide/ops/persistence/index.md
@@@ -246,16 -246,16 +246,17 @@@ The state can be downloaded periodicall
An example script to be invoked by CRON is shown below:
DATE=`date "+%Y%m%d.%H%M.%S"`
- BACKUP_FILENAME=/path/to/archives/back-${DATE}.tar.gz
- TEMP_DATA_DIR=/path/to/tempdir
-
- brooklyn copy-state \
- --persistenceLocation named:my-persistence-location \
- --persistenceDir /path/to/bucket \
- --destinationDir $TEMP_DATA_DIR
+ BACKUP_FILENAME=/path/to/archives/back-${DATE}.zip
+ HOSTNAME=localhost
+ USERNAME=admin
+ PASSWORD=pa55wOrd
+
+ curl -v -u "${USERNAME}:${PASSWORD}" \
+ https://${HOSTNAME}:8443/v1/server/ha/persist/export \
+ > ${BACKUP_FILENAME}
- # For s3cmd installation see http://s3tools.org/repositories
- s3cmd put $BACKUP_FILENAME s3://mybackupbucket
+ tar --exclude '*/backups/*' -czvf $BACKUP_FILENAME $TEMP_DATA_DIR
+ # For AWS CLI installation see https://aws.amazon.com/cli
+ aws s3 cp $BACKUP_FILENAME s3://mybackupbucket
rm $BACKUP_FILENAME
- rm -r $TEMP_DATA_DIR
+
[3/4] brooklyn-docs git commit: Update index.md
Posted by du...@apache.org.
Update index.md
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/2a8ae61e
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/2a8ae61e
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/2a8ae61e
Branch: refs/heads/master
Commit: 2a8ae61e4e0fc68b9c2f2288f03431b5083cdacc
Parents: ce557de
Author: Thomas Bouron <tb...@gmail.com>
Authored: Thu Jun 21 15:14:22 2018 +0100
Committer: GitHub <no...@github.com>
Committed: Thu Jun 21 15:14:22 2018 +0100
----------------------------------------------------------------------
guide/ops/persistence/index.md | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-docs/blob/2a8ae61e/guide/ops/persistence/index.md
----------------------------------------------------------------------
diff --git a/guide/ops/persistence/index.md b/guide/ops/persistence/index.md
index f98914f..b7c961b 100644
--- a/guide/ops/persistence/index.md
+++ b/guide/ops/persistence/index.md
@@ -255,7 +255,6 @@ An example script to be invoked by CRON is shown below:
https://${HOSTNAME}:8443/v1/server/ha/persist/export \
> ${BACKUP_FILENAME}
- tar --exclude '*/backups/*' -czvf $BACKUP_FILENAME $TEMP_DATA_DIR
# For AWS CLI installation see https://aws.amazon.com/cli
aws s3 cp $BACKUP_FILENAME s3://mybackupbucket
rm $BACKUP_FILENAME
[4/4] brooklyn-docs git commit: Closes #260
Posted by du...@apache.org.
Closes #260
Use the official AWS CLI instead of s3cmd
Based on this comment: https://github.com/apache/brooklyn-docs/pull/258#discussion_r197133399
Note: I checked the docs and this is the only place where we suggested to use `s3cmd`
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/commit/29c11688
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/tree/29c11688
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-docs/diff/29c11688
Branch: refs/heads/master
Commit: 29c11688ac6330c22ea7a497dd1c3a9edf6f889c
Parents: f63a2dc 2a8ae61
Author: Duncan Grant <du...@cloudsoftcorp.com>
Authored: Thu Jun 21 15:16:23 2018 +0100
Committer: Duncan Grant <du...@cloudsoftcorp.com>
Committed: Thu Jun 21 15:16:23 2018 +0100
----------------------------------------------------------------------
guide/ops/persistence/index.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------