katylava

Update 2022: git checkout -p <other-branch> is basically a shortcut for all this.

FYI This was written in 2010, though I guess people still find it useful at least as of 2021. I haven't had to do it ever again, so if it goes out of date I probably won't know.

Example: You have a branch refactor that is quite different from master. You can't merge all of the commits, or even every hunk in any single commit or master will break, but you have made a lot of improvements there that you would like to bring over to master.

Note: This will not preserve the original change authors. Only use if necessary, or if you don't mind losing that information, or if you are only merging your own work.

teh

import daemon, lockfile, signal, logging

import eventlet
from eventlet import wsgi, timeout

worker_pool = eventlet.GreenPool(20)
sock = eventlet.listen(('', 8000))

def proper_shutdown():
    worker_pool.resize(0)

chrishamant

#!/usr/bin/env python
"""Split large file into multiple pieces for upload to S3.

S3 only supports 5Gb files for uploading directly, so for larger CloudBioLinux
box images we need to use boto's multipart file support.

This parallelizes the task over available cores using multiprocessing.

Usage:
  s3_multipart_upload.py <file_to_transfer> <bucket_name> [<s3_key_name>]

clintongormley

#!/usr/bin/perl

use ElasticSearch;
use Text::CSV_XS;

my $csv_file = 'output.csv';
open my $fh, '>:encoding(utf8)', $csv_file or die $!;


my $csv = Text::CSV_XS->new;

kgriffs

# Configuration file for runtime kernel parameters.
# See sysctl.conf(5) for more information.

# See also http://www.nateware.com/linux-network-tuning-for-2013.html for
# an explanation about some of these parameters, and instructions for
# a few other tweaks outside this file.
#
# See also: https://gist.github.com/kgriffs/4027835
#
# Assumes a beefy machine with lots of network bandwidth

guilhem

server {
        listen 80;

        server_name     _;
        client_max_body_size 100m;

        location / {
                fastcgi_pass_header     Authorization;
                fastcgi_pass_request_headers on;

rothgar

# Idempotent way to build a /etc/hosts file with Ansible using your Ansible hosts inventory for a source.
# Will include all hosts the playbook is run on.
# Inspired from http://xmeblog.blogspot.com/2013/06/ansible-dynamicaly-update-etchosts.html

- name: "Build hosts file"
  lineinfile: dest=/etc/hosts regexp='.*{{ item }}$' line="{{ hostvars[item].ansible_default_ipv4.address }} {{item}}" state=present
  when: hostvars[item].ansible_default_ipv4.address is defined
  with_items: groups['all']

edrex

Let's set up Camlistore on a Linux server, with blobs stored in s3. This seems to be the currently best-supported option for "cloud" deployment.

This is meant as a supplement to the official server config doc. Read through both docs before you start.

http://camlistore.org/docs/server-config

This blog post is also recommended reading.

I've posted my config files for reference, but they will be created the first time you run camlistored (for the server) and camput init (for the client) so don't copy them.

telent

App configuration in environment variables: for and against

For (some of these as per the 12 factor principles) 

1) they are are easy to change between deploys without changing any code

2) unlike config files, there is little chance of them being checked
into the code repo accidentally

3) unlike custom config files, or other config mechanisms such as Java

P7h

tmux vs. screen commands

---

Action	tmux	screen
start a new session	tmux tmux new tmux new-session	screen
start a new session with a name	tmux new -s name	screen -S name
re-attach a detached session	tmux attach tmux attach-session	screen -r
re-attach a detached session with a name	tmux attach -t name tmux a -t name	screen -r name
re-attach an attached session (detaching it from elsewhere)	tmux attach -dtmux attach-session -d	screen -dr