View 00_OSX_Docker_Machine_Setup.md

What this?

So one of the painful points of using docker on OS X is that you need to run a virtualbox VM, which often suffers from performance issues. With xhyve, a OS X virtualization system, and docker-machine-xhyve you can now have docker use the native OS X hypervisor to run containers.

No more dealing with virtualbox shenanigans!

In this script, I've also set up a way to autoconfigure terminal sessions to load docker's environment vars (dependent on docker-machine) so you do not have to run eval $(docker-machine env whatever) every time you open a new terminal window.

Requirements

View failover.sh
#!/bin/bash
#------------------------------------------------------------
# title :failover.sh
# description :This script will call hetzner failover api
# author :Sebastian Reimers <support@miete-admin.de>
# date :18.02.2016
# version :0.1
#------------------------------------------------------------
# settings
View zabbix 3.2, Ubuntu 16.04.1, php7, nginx, postgres.md

cd ~/Downloads

wget http://repo.zabbix.com/zabbix/3.2/ubuntu/pool/main/z/zabbix-release/zabbix-release_3.2-1+xenial_all.deb

dpkg -i zabbix-release_3.2-1+xenial_all.deb

apt-get update

should add /etc/apt/sources.list.d/zabbix.list

View branch-fu.md

Example: Moving up to a few commits to another branch

Branch A has commits (X,Y) that also need to be in Branch B. The cherry-pick operations should be done in the same chronological order that the commits appear in Branch A.

cherry-pick does support a range of commits, but if you have merge commits in that range, it gets really complicated

git checkout branch-B
git cherry-pick X
git cherry-pick Y
View gist:05f405d6af6bece425b1
git fetch --all
git reset --hard origin/master
git pull origin master