mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch '1.0-maint'

This commit is contained in:
Thomas Waldmann 2016-05-01 20:28:17 +02:00
parent 240e5696b7 700e715b23
commit b641d11e1b
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -107,7 +107,7 @@ Now doing another backup, just to show off the great deduplication::
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
For a graphical frontend refer to our complementary project `BorgWeb <https://borgbackup.github.io/borgweb/>`_. For a graphical frontend refer to our complementary project `BorgWeb <https://borgweb.readthedocs.io/>`_.
Links Links
===== =====

5
Vagrantfile vendored
View File

@ -54,14 +54,15 @@ def packages_darwin
# install all the (security and other) updates # install all the (security and other) updates
sudo softwareupdate --install --all sudo softwareupdate --install --all
# get osxfuse 3.0.x pre-release code from github: # get osxfuse 3.0.x pre-release code from github:
curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.0.9/osxfuse-3.0.9.dmg >osxfuse.dmg curl -s -L https://github.com/osxfuse/osxfuse/releases/download/osxfuse-3.2.0/osxfuse-3.2.0.dmg >osxfuse.dmg
MOUNTDIR=$(echo `hdiutil mount osxfuse.dmg | tail -1 | awk '{$1="" ; print $0}'` | xargs -0 echo) \ MOUNTDIR=$(echo `hdiutil mount osxfuse.dmg | tail -1 | awk '{$1="" ; print $0}'` | xargs -0 echo) \
&& sudo installer -pkg "${MOUNTDIR}/Extras/FUSE for OS X 3.0.9.pkg" -target / && sudo installer -pkg "${MOUNTDIR}/Extras/FUSE for OS X 3.2.0.pkg" -target /
sudo chown -R vagrant /usr/local # brew must be able to create stuff here sudo chown -R vagrant /usr/local # brew must be able to create stuff here
ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
brew update brew update
brew install openssl brew install openssl
brew install lz4 brew install lz4
brew install xz # required for python lzma module
brew install fakeroot brew install fakeroot
brew install git brew install git
brew install pkgconfig brew install pkgconfig

2
docs/resources.rst
View File

@ -36,6 +36,6 @@ Some of them refer to attic, but you can do the same stuff (and more) with borgb
Software Software
-------- --------
- `BorgWeb - a very simple web UI for BorgBackup <https://borgbackup.github.io/borgweb/>`_ - `BorgWeb - a very simple web UI for BorgBackup <https://borgweb.readthedocs.io/>`_
- some other stuff found at the `BorgBackup Github organisation <https://github.com/borgbackup/>`_ - some other stuff found at the `BorgBackup Github organisation <https://github.com/borgbackup/>`_
- `atticmatic <https://github.com/witten/atticmatic/>`_ (includes borgmatic) - `atticmatic <https://github.com/witten/atticmatic/>`_ (includes borgmatic)

3
docs/usage.rst
View File

@ -645,6 +645,9 @@ Examples
... ...
.. include:: usage/break-lock.rst.inc
Miscellaneous Help Miscellaneous Help
------------------ ------------------

2
setup.py
View File

@ -298,7 +298,7 @@ setup(
}, },
author='The Borg Collective (see AUTHORS file)', author='The Borg Collective (see AUTHORS file)',
author_email='borgbackup@python.org', author_email='borgbackup@python.org',
url='https://borgbackup.readthedocs.org/', url='https://borgbackup.readthedocs.io/',
description='Deduplicated, encrypted, authenticated and compressed backups', description='Deduplicated, encrypted, authenticated and compressed backups',
long_description=long_description, long_description=long_description,
license='BSD', license='BSD',