Skip to content

Instantly share code, notes, and snippets.

View anteaya's full-sized avatar

Anita Kuno anteaya

View GitHub Profile
@anteaya
anteaya / Encbox.md
Created July 21, 2013 17:26 — forked from Tho85/Encbox.md

Build your own private, encrypted, open-source Dropbox-esque sync folder

Prerequisites:

  • One or more clients running a UNIX-like OS. Examples are given for Ubuntu 12.04 LTS, although all software components are available for other platforms as well (e.g. OS X). YMMV
  • A cheap Ubuntu 12.04 VPS with storage. I recommend Backupsy, they offer 250GB storage for $5/month. Ask Google for coupon codes.

Software components used:

  • Unison for file synchronization
  • EncFS for folder encryption
$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: Added PyRSS2Gen and python-swiftclient to pip-requires to satisfy the openstackwatch dependency.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging tools/pip-requires
CONFLICT (content): Merge conflict in tools/pip-requires
Failed to merge in the changes.
Patch failed at 0001 Added PyRSS2Gen and python-swiftclient to pip-requires to satisfy the openstackwatch dependency.
#------------------------------------------------
# a first-time contributor walking thru the contribution process
#
#----------------------------------------------
# running tox for the first time
barton@ubuntu:/opt/stack/nova$ sudo pip install tox
vagrant@precise64:~/devstack$ cd /opt/stack/nova
vagrant@precise64:/opt/stack/nova$ tox
GLOB sdist-make: /opt/stack/nova/setup.py
py26 create: /opt/stack/nova/.tox/py26
ERROR: InterpreterNotFound: python2.6
py27 create: /opt/stack/nova/.tox/py27
py27 installdeps: -r/opt/stack/nova/tools/pip-requires, -r/opt/stack/nova/tools/test-requires
py27 inst: /opt/stack/nova/.tox/dist/nova-2013.2.a28.ga92b7c8.zip
py27 runtests: commands[0]
py27 runtests: commands[1]
vagrant@precise64:~/devstack$ cd /opt/stack/nova
vagrant@precise64:/opt/stack/nova$ tox
GLOB sdist-make: /opt/stack/nova/setup.py
py26 create: /opt/stack/nova/.tox/py26
ERROR: InterpreterNotFound: python2.6
py27 create: /opt/stack/nova/.tox/py27
py27 installdeps: -r/opt/stack/nova/tools/pip-requires, -r/opt/stack/nova/tools/test-requires
py27 inst: /opt/stack/nova/.tox/dist/nova-2013.2.a28.ga92b7c8.zip
py27 runtests: commands[0]
py27 runtests: commands[1]
@anteaya
anteaya / A Commit
Last active December 15, 2015 07:19
Devstack installation and OpenStack Contribution with Cybera
cd /opt/stack/nova
tox
git status
git branch
git checkout -b test-patch-for-new-contributor
@anteaya
anteaya / localrc
Created March 19, 2013 00:33 — forked from etoews/localrc
ADMIN_PASSWORD=devstack
MYSQL_PASSWORD=devstack
RABBIT_PASSWORD=devstack
SERVICE_PASSWORD=devstack
SERVICE_TOKEN=devstack
FLAT_INTERFACE=br100
PUBLIC_INTERFACE=eth1
VOLUME_BACKING_FILE_SIZE=5120M
$ git log
commit 67e26e3a61f8238d9a97f4b0f4f771a92402ad3e
Merge: 6eb298f edc4bc2
Author: Anita Kuno <akuno@lavabit.com>
Date: Tue Feb 26 09:45:01 2013 -0500
Merge branch 'feature'
commit 6eb298f9c5858291ac817dca4238957b628e7200
Author: Anita Kuno <akuno@lavabit.com>
$ cat .git/ORIG_HEAD
6eb298f9c5858291ac817dca4238957b628e7200
$ cat .git/refs/heads/master
67e26e3a61f8238d9a97f4b0f4f771a92402ad3e
$ cat .git/refs/heads/feature
edc4bc271061087657dbeb4e56970da8c84f4ac6
$ cat .git/logs/HEAD
0000000000000000000000000000000000000000 d561f82d45e267593220296ac3e956e47a98717f Anita Kuno <akuno@lavabit.com> 1361885197 -0500 commit (initial): adding my first file
d561f82d45e267593220296ac3e956e47a98717f d561f82d45e267593220296ac3e956e47a98717f Anita Kuno <akuno@lavabit.com> 1361886063 -0500 checkout: moving from master to feature
d561f82d45e267593220296ac3e956e47a98717f edc4bc271061087657dbeb4e56970da8c84f4ac6 Anita Kuno <akuno@lavabit.com> 1361888950 -0500 commit: this is my second commit, made to the topic branch named feature
$ git status
# On branch master
nothing to commit (working directory clean)
$ git merge feature
Merge made by the 'recursive' strategy.
second_file.txt | 1 +
1 file changed, 1 insertion(+)
create mode 100644 second_file.txt
[anita@anita-fedora git_sample]$ tree .git
.git